hersey tamam
conflict resolved