fonts changed
small conflict changes