Remove merge zombie