From 6b03112ea1b0ded1ac487fa2b00b3bfd6eba652e Mon Sep 17 00:00:00 2001
From: Jai Radhakrishnan <55522316+jairad26@users.noreply.github.com>
Date: Fri, 15 Nov 2024 11:04:01 -0800
Subject: [PATCH] w

---
 runtime/go.mod               | 1 +
 runtime/go.sum               | 1 +
 runtime/httpserver/server.go | 3 ---
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/runtime/go.mod b/runtime/go.mod
index 8787d0b3..158a16d7 100644
--- a/runtime/go.mod
+++ b/runtime/go.mod
@@ -35,6 +35,7 @@ require (
 	github.com/lestrrat-go/jwx v1.2.30
 	github.com/prometheus/client_golang v1.20.5
 	github.com/prometheus/common v0.60.1
+	github.com/rs/cors v1.6.0
 	github.com/rs/xid v1.6.0
 	github.com/rs/zerolog v1.33.0
 	github.com/spf13/cast v1.7.0
diff --git a/runtime/go.sum b/runtime/go.sum
index 5a3afb86..e4a16fc3 100644
--- a/runtime/go.sum
+++ b/runtime/go.sum
@@ -695,6 +695,7 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI=
 github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
diff --git a/runtime/httpserver/server.go b/runtime/httpserver/server.go
index e9dd3c95..44c062cd 100644
--- a/runtime/httpserver/server.go
+++ b/runtime/httpserver/server.go
@@ -23,11 +23,8 @@ import (
 	"github.com/hypermodeinc/modus/lib/manifest"
 	"github.com/hypermodeinc/modus/runtime/app"
 	"github.com/hypermodeinc/modus/runtime/config"
-<<<<<<< HEAD
 	"github.com/hypermodeinc/modus/runtime/db"
-=======
 	"github.com/hypermodeinc/modus/runtime/explorer"
->>>>>>> main
 	"github.com/hypermodeinc/modus/runtime/graphql"
 	"github.com/hypermodeinc/modus/runtime/logger"
 	"github.com/hypermodeinc/modus/runtime/manifestdata"