merged
fixed require model issue