Fixed migrations and model relationships
Fixed merge conflict