fix syntax error leads to heroku crash
revert search migration
resolve merge conflicts