histrogram
Conflict resloved