bugs resoled and pdf report complete except histogram
conflict resolved, pdf report complete except histogram and bugs resolved