Conflict changes added