diff --git a/CHANGELOG.md b/CHANGELOG.md
index f60adb9..4fd9cef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,13 @@
 
 -   N/A
 
+<<<<<<< HEAD
 ## [1.13.1] - 2024-10-19
 
 -   Fixed an auth issue on frontend [cd916c](https://github.com/caprover/caprover-frontend/commit/cd916c53c4b15ec3f71863075dc4d2a729e2266e)
 
+=======
+>>>>>>> release
 ## [1.13.0] - 2024-10-19
 
 -   New: Added project structure [issue-158](https://github.com/caprover/caprover-frontend/pull/158)
diff --git a/dev-scripts/build_and_push_release.sh b/dev-scripts/build_and_push_release.sh
index 62da472..041cc4d 100755
--- a/dev-scripts/build_and_push_release.sh
+++ b/dev-scripts/build_and_push_release.sh
@@ -44,7 +44,11 @@ echo $IMAGE_NAME:$CAPROVER_VERSION
 echo "**************************************"
 echo "**************************************"
 
+<<<<<<< HEAD
 FRONTEND_COMMIT_HASH=cd916c53c4b15ec3f71863075dc4d2a729e2266e
+=======
+FRONTEND_COMMIT_HASH=9f6c377137088c10b5582c4c9cd8285a9bd450d9
+>>>>>>> release
 
 ## Building frontend app
 ORIG_DIR=$(pwd)