[FOLD] virtIL Fix some conflicts