remove failed merge code