diff --git a/resolve-trivial-conflicts.cabal b/resolve-trivial-conflicts.cabal
--- a/resolve-trivial-conflicts.cabal
+++ b/resolve-trivial-conflicts.cabal
@@ -2,7 +2,7 @@
 -- further documentation, see http://haskell.org/cabal/users-guide/
 
 name:                resolve-trivial-conflicts
-version:             0.3.1
+version:             0.3.1.1
 synopsis:            Remove trivial conflict markers in a git repository
 description:         Remove trivial conflict markers in a git repository
 homepage:            https://github.com/ElastiLotem/resolve-trivial-conflicts
diff --git a/resolve_trivial_conflicts.hs b/resolve_trivial_conflicts.hs
--- a/resolve_trivial_conflicts.hs
+++ b/resolve_trivial_conflicts.hs
@@ -56,10 +56,10 @@
 
 -- '>' -> ">>>>>>> "
 markerPrefix :: Char -> String
-markerPrefix c = replicate 7 c ++ " "
+markerPrefix c = replicate 7 c
 
 markerLine :: Char -> String -> String
-markerLine c str = markerPrefix c ++ str ++ "\n"
+markerLine c str = markerPrefix c ++ " " ++ str ++ "\n"
 
 breakUpToMarker :: MonadState [(LineNo, String)] m => Char -> m [(LineNo, String)]
 breakUpToMarker c = state (break ((markerPrefix c `isPrefixOf`) . snd))