Removed .orig file after merge.