modified display.ml
fixing conflicts
fixing conflicts