Fix git conflict in exercises_spec.rb