Merge functionality added and working. Writing corresponding cucumber feature now