Removed .orig file from merge conflict