Removed .orig files hanging around from a previous merge.