[KFSQA-855] fix a merge issue