Removed .orig file after merge conflict