diff --git a/git-flow-feature b/git-flow-feature
index c85c1e3..8014fcc 100644
--- a/git-flow-feature
+++ b/git-flow-feature
@@ -232,7 +232,7 @@
 	DEFINE_boolean rebase false "rebase instead of merge" r
 	DEFINE_boolean keep false "keep branch after performing finish" k
 	DEFINE_boolean force_delete false "force delete feature branch after finish" D
-    DEFINE_boolean squash false "squash feature during merge" S
+	DEFINE_boolean squash false "squash feature during merge" S
 	parse_args "$@"
 	expand_nameprefix_arg_or_current
 
@@ -313,13 +313,13 @@
 	if [ "$(git rev-list -n2 "$DEVELOP_BRANCH..$BRANCH" | wc -l)" -eq 1 ]; then
 		git merge --ff "$BRANCH"
 	else
-        if noflag squash; then
+		if noflag squash; then
 		    git merge --no-ff "$BRANCH"
-        else
-            git merge --squash "$BRANCH"
-            git commit
-            git merge "$BRANCH"
-        fi
+		else
+			git merge --squash "$BRANCH"
+			git commit
+			git merge "$BRANCH"
+		fi
 	fi
 
 	if [ $? -ne 0 ]; then
@@ -360,7 +360,7 @@
 			git branch -d "$BRANCH"
 		fi
 	fi
-t 
+
 	echo
 	echo "Summary of actions:"
 	echo "- The feature branch '$BRANCH' was merged into '$DEVELOP_BRANCH'"