Remove cucumber
Fix merge conflicts