Create rake db:yolo
fix merge