Fix merge conflict
Fix merge conflict

marxarelli/cucumber,enkessler/cucumber-ruby,cucumber/cucumber-ruby,shadow000902/cucumber-ruby,marxarelli/cucumber,richarda/cucumber,shadow000902/cucumber-ruby,twalpole/cucumber,danascheider/cucumber-ruby,richarda/cucumber,cucumber/cucumber-ruby,phoebeclarke/cucumber-ruby,twalpole/cucumber,enkessler/cucumber-ruby,enkessler/cucumber-ruby,danascheider/cucumber-ruby,phoebeclarke/cucumber-ruby,cucumber/cucumber-ruby