created associations and migrations
fix merge conflicts