ivar2: fix merge error