removed extra merge files