removed .orig files, and fixed a typo from merge