redo conflict display