models
fixing merge