diff --git a/server/lib/blueprints/proxyResources.ts b/server/lib/blueprints/proxyResources.ts
index c142cdc0..bbfc260f 100644
--- a/server/lib/blueprints/proxyResources.ts
+++ b/server/lib/blueprints/proxyResources.ts
@@ -113,12 +113,9 @@ export async function updateProxyResources(
                     internalPort: internalPortToCreate,
                     path: targetData.path,
                     pathMatchType: targetData["path-match"],
-<<<<<<< HEAD
                     rewritePath: targetData.rewritePath,
-                    rewritePathType: targetData["rewrite-match"]
-=======
+                    rewritePathType: targetData["rewrite-match"],
                     priority: targetData.priority
->>>>>>> b8d96345 (priority add for traefik config setup)
                 })
                 .returning();
 
@@ -366,12 +363,9 @@ export async function updateProxyResources(
                             enabled: targetData.enabled,
                             path: targetData.path,
                             pathMatchType: targetData["path-match"],
-<<<<<<< HEAD
                             rewritePath: targetData.rewritePath,
-                            rewritePathType: targetData["rewrite-match"]
-=======
+                            rewritePathType: targetData["rewrite-match"],
                             priority: targetData.priority
->>>>>>> b8d96345 (priority add for traefik config setup)
                         })
                         .where(eq(targets.targetId, existingTarget.targetId))
                         .returning();