add new cucumber scenarios, and include merge comments function