Removed some extra merge files