Resolved conflicts in Gemfile.lock