diff --git a/bin/composer-git-merge-driver b/bin/composer-git-merge-driver
index 17b8c44..180455b 100755
--- a/bin/composer-git-merge-driver
+++ b/bin/composer-git-merge-driver
@@ -226,13 +226,13 @@ if (count($conflicts)) {
 		$parts[] = str_repeat('>', $markerLen);
 		return implode("\n", $parts);
 	}, $merged);
+}
 
-	// fix the indentation per the user's preference
-	if ($indentation !== $defaultIndentation) {
-		$merged = preg_replace_callback("/^(?:{$defaultIndentation})+/m", function($matches) use ($indentation) {
-			return str_repeat($indentation, strlen($matches[0]) / 4);
-		}, $merged);
-	}
+// fix the indentation per the user's preference
+if ($indentation !== $defaultIndentation) {
+	$merged = preg_replace_callback("/^(?:{$defaultIndentation})+/m", function($matches) use ($indentation) {
+		return str_repeat($indentation, strlen($matches[0]) / 4);
+	}, $merged);
 }
 
 // update the file