fixed modelBase conflict changes