removed merge orig files