diff --git a/bin/deploy/merge_develop_to_master.sh b/bin/deploy/merge_develop_to_master.sh
index fcd5a3fe..fe635cac 100644
--- a/bin/deploy/merge_develop_to_master.sh
+++ b/bin/deploy/merge_develop_to_master.sh
@@ -7,7 +7,7 @@ if [ "$TRAVIS_BRANCH" == "develop" ]; then
     git fetch
     git reset --hard
     git checkout master || echo "Git checkout master failed"
-    git merge "$TRAVIS_COMMIT" || echo "Merge develop to master failed"
+    git merge --ff-only "$TRAVIS_COMMIT" || echo "Merge develop to master failed"
     git push -q https://$GITHUB_TOKEN@github.com/ggeop/Python-ai-assistant master
 fi
 
diff --git a/bin/deploy/merge_feature_branch_to_develop.sh b/bin/deploy/merge_feature_branch_to_develop.sh
deleted file mode 100644
index 793b2e6b..00000000
--- a/bin/deploy/merge_feature_branch_to_develop.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if [ "$TRAVIS_BRANCH" != "develop" ] && [ "$TRAVIS_BRANCH" != "master" ]; then
-    git config --global user.email "builds@travis-ci.com"
-    git config --global user.name "Travis CI"
-    git remote set-branches --add origin develop || echo "Set origin develop failed"
-    git fetch
-    git reset --hard
-    git checkout develop || echo "Git checkout master failed"
-    git merge "$TRAVIS_COMMIT" || echo "Merge feature branch to develop failed"
-    git push -q https://$GITHUB_TOKEN@github.com/ggeop/Python-ai-assistant develop
-fi