removed merge files