[FOLD] Fix merge error