removed merge .orig files