added in the foreign key index to the migrations
solved merge conflict
fixed merge conflicts
fixed merge conflicts
fixed merge conflict issues
updated schema
pulled from github
fixed merge conflicts
merge conflicts resolved
merge conflicts done
about to pull
fixed merge conflicts