Added missing conflict changes