Fixed merge conflicts in gemfile.lock