solve conflicts for display redo