wip
fix merging conflict
install mysql gem and update gemfile.lock
fixed Gemfile