fixed associations w/ join tables
fixed merge conflicts