fixed merge conflict changes