Move merge_with to top of model to fix heroku deployment (hopefully)
Fix merge conflict