Fixed heroku pull conflicts
Fixed conflict during merge
Removed seeds