Resolve Gemfile.lock merge conflict