removed merge orig file