Commit before pulling from a big merge conflict