removed the conflict changes