solved merge conflict in gemfile.lock