working on histogram
fixing conflicts
grammar