[CHANGE] fix merge commit