Switch to native merge behavior