[wol] fix merge