set up the correct model associations
fix merge conflicts