edit solution model
rake db change on dev.log
conflict merge
problem and solution controllers