Remove conflict code fragment in .rspec file