diff --git a/src/dependencies.pug b/src/dependencies.pug
index 838a2ed..5d19ba6 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -24,18 +24,6 @@ if endpoints.get
     //- script(type="module" src="/lib/sib-resource/sib-resource.js" defer)
 
   if endpoints.get.joboffers
-<<<<<<< HEAD
-    //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-job-board@beta" defer)
-    script(type="module" src="/lib/solid-job-board/dist/index.js" defer)
-
-  if endpoints.get.uploads && endpoints.get.skills && endpoints.get.users
-    //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-directory@beta" defer)
-    script(type="module" src="/lib/solid-directory/dist/index.js" defer)
-
-  if endpoints.get.dashboards
-    //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-dashboard@beta" defer)
-    script(type="module" src="/lib/solid-dashboard/dist/index.js" defer)
-=======
     script(type="module" src="https://cdn.skypack.dev/@startinblox/component-job-board@2.0" defer)
     //- script(type="module" src="/lib/solid-job-board/dist/index.js" defer)
 
@@ -46,7 +34,6 @@ if endpoints.get
   if endpoints.get.dashboards
     script(type="module" src="https://cdn.skypack.dev/@startinblox/component-dashboard@1.0" defer)
     //- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer)
->>>>>>> 2c05cf1bf758ade9d44af962e3452ee8c2e61495
 
   if endpoints.get.users
     script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@2.0" defer)