Stripped out all the .orig files from the merge