Remove merge code