Remove merge magic