Removed .orig files from bad merge