Fix backup config for conflicted files in Git