sparse_disp: clean up bad merge