diff --git a/local/bin/git-finish b/local/bin/git-finish
index d5ecdfc..98dc49b 100755
--- a/local/bin/git-finish
+++ b/local/bin/git-finish
@@ -18,7 +18,7 @@ merge-into() {
 	git merge --no-ff $branch --message "Merge $kind '$name'$pullreq into $1" || exit $?
 }
 
-[[ $kind = hotfix ]] && merge-into master
+[[ $kind = feature ]] || merge-into master
 merge-into develop
 
 echo "Merge successful, deleting $branch..." >&2