diff --git a/resolve-trivial-conflicts.cabal b/resolve-trivial-conflicts.cabal
--- a/resolve-trivial-conflicts.cabal
+++ b/resolve-trivial-conflicts.cabal
@@ -2,9 +2,9 @@
 -- further documentation, see http://haskell.org/cabal/users-guide/
 
 name:                resolve-trivial-conflicts
-version:             0.2
+version:             0.2.0.1
 synopsis:            Remove trivial conflict markers in a git repository
--- description:
+description:         Remove trivial conflict markers in a git repository
 homepage:            https://github.com/ElastiLotem/resolve-trivial-conflicts
 license:             GPL-2
 license-file:        LICENSE
@@ -15,6 +15,10 @@
 build-type:          Simple
 -- extra-source-files:
 cabal-version:       >=1.10
+
+source-repository head
+  type: git
+  location: https://github.com/Elastilotem/resolve-trivial-conflicts
 
 executable resolve-trivial-conflicts
   main-is:             resolve_trivial_conflicts.hs
diff --git a/resolve_trivial_conflicts.hs b/resolve_trivial_conflicts.hs
--- a/resolve_trivial_conflicts.hs
+++ b/resolve_trivial_conflicts.hs
@@ -5,7 +5,7 @@
 import Control.Monad.Writer
 import Data.List
 import PPDiff (ppDiff)
-import System.Directory (renameFile)
+import System.Directory (renameFile, removeFile)
 import System.Environment (getProgName, getArgs, getEnv)
 import System.FilePath
 import System.Process
@@ -183,8 +183,10 @@
               , " conflicts (failed to resolve " ++ show failures ++ " conflicts)"
               , if failures == 0 then ", git adding" else ""
               ]
-            renameFile fileName (fileName <.> "bk")
+            let bkup = fileName <.> "bk"
+            renameFile fileName bkup
             writeFile fileName newContent
+            removeFile bkup
             if failures == 0
               then gitAdd fileName
               else dumpAndOpenEditor opts fileName diffs