diff --git a/application/backend/.editorconfig b/application/backend/.editorconfig
index bede57d0e..49d725bab 100644
--- a/application/backend/.editorconfig
+++ b/application/backend/.editorconfig
@@ -1,9 +1,6 @@
 [*]
 indent_style = space
-<<<<<<< HEAD
-=======
 indent_size = 2
->>>>>>> develop
 
 [*.java]
 indent_size = 4
diff --git a/application/backend/src/main/java/ai/typerefinery/websight/actions/package-info.java b/application/backend/src/main/java/ai/typerefinery/websight/actions/package-info.java
deleted file mode 100644
index 1ae1285a1..000000000
--- a/application/backend/src/main/java/ai/typerefinery/websight/actions/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2023 Typerefinery.io
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@Version("1.0.0")
-package ai.typerefinery.websight.actions;
-
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
diff --git a/application/backend/src/main/java/ai/typerefinery/websight/actions/pages/package-info.java b/application/backend/src/main/java/ai/typerefinery/websight/actions/pages/package-info.java
deleted file mode 100644
index a7c0b2955..000000000
--- a/application/backend/src/main/java/ai/typerefinery/websight/actions/pages/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2023 Typerefinery.io
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@Version("1.0.0")
-package ai.typerefinery.websight.actions.pages;
-
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
diff --git a/application/backend/src/main/java/ai/typerefinery/websight/package-info.java b/application/backend/src/main/java/ai/typerefinery/websight/package-info.java
deleted file mode 100644
index 5e324badd..000000000
--- a/application/backend/src/main/java/ai/typerefinery/websight/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2023 Typerefinery.io
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@Version("1.0.0")
-package ai.typerefinery.websight;
-
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
diff --git a/application/backend/src/main/java/ai/typerefinery/websight/rest/assets/package-info.java b/application/backend/src/main/java/ai/typerefinery/websight/rest/assets/package-info.java
deleted file mode 100644
index 170c9587e..000000000
--- a/application/backend/src/main/java/ai/typerefinery/websight/rest/assets/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2023 Typerefinery.io
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@Version("1.0.0")
-package ai.typerefinery.websight.rest.assets;
-
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
diff --git a/build.ps1 b/build.ps1
index adf152736..30196e8a6 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-mvn clean install
-=======
 $CURRENT_PATH = Get-Location
 Set-Location -Path ".\"
 try {
@@ -8,4 +5,3 @@ try {
 } finally {
     Set-Location -Path $CURRENT_PATH
 }
->>>>>>> develop
diff --git a/distribution/src/main/features/typerefinery.json b/distribution/src/main/features/typerefinery.json
index 765e6d916..6ad78300b 100644
--- a/distribution/src/main/features/typerefinery.json
+++ b/distribution/src/main/features/typerefinery.json
@@ -74,8 +74,7 @@
       "sling.additional.response.headers":[
         "X-Content-Type-Options=nosniff",
         "Cache-control=no-cache",
-        "Strict-Transport-Security=max-age=31536000",
-        "SameSite=None"
+        "Strict-Transport-Security=max-age=31536000"
       ]
     },
     "pl.ds.websight.publishing.connectors.filesystem.FileSystemStorageConnector~typerefinery": {