created user goal associations
fixed merge conflicts