[noticket] fix merge