Readded mege-confiliting files