fixes active record relationships
merge conflict