diff --git a/.releaserc b/.releaserc
index 2517c1be42..c3194186ae 100644
--- a/.releaserc
+++ b/.releaserc
@@ -1,9 +1,5 @@
 {
-<<<<<<< HEAD
-	"branches": ["version-15"],
-=======
-	"branches": ["version-14", "version-15"],
->>>>>>> d1f28b6 (chore: fix symantic release config)
+"branches": ["version-14", "version-15"],
 	"plugins": [
 		"@semantic-release/commit-analyzer", {
 			"preset": "angular",
@@ -25,4 +21,4 @@
 		],
 		"@semantic-release/github"
 	]
-}
\ No newline at end of file
+}