Remove accidentally checked in .orig files from merge
Remove unwanted file