Fix some merge error