Put conflict changes back