Merge in rails app w migrations