modify models, databases, relationships lesson
fix merge conflict