Fix merge bug
Fix merge bug

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