Setup Cucumber
Fix merge conflicts