removed merge resolve .orig files