remove all conflict in files