Generated the CategoryProducts model and migrated the database
Solving merge conflicts