Resolved conflicts in gemfile.lock