some strange commit
added merge features cucumber tests