diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 3fee3e11f..859dbcfb2 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -44,7 +44,7 @@ mark_as_release() {
     echo "* Marking release as $rel_branch"
     ensure_local_branch $rel_branch
     git checkout $rel_branch
-    git merge $branch
+    git merge -s recursive -X theirs $branch
 }
 
 # Read required parameters