Deleting .orig files (were created by git during conflicts)