Fixed conflicts in Gemfile.lock