Fix UNDEFINED in merge