[Core] Fix merge error