solve merge conflict in Gemfile.lock