[Core] Fix merge conflict