Conflict changes from PC