Update cucumber dependency to ~> 1.3
Fix merge conflict.