added cucumber feature for the merging