Fixed gemfile
fixed merge