Gemfile.lock merge conflicts fixed