-some changes made
-conflict changes made
-classes changd