[KFSQA-697] fix merge