pivotal stories to cucumber features
Merges conflicts