might have the actual conflict changes in it