fix merge issues with models
Fixed merge conflicts on model associations