Fixed conflicts in gemfile.lock