Added non-li-hp explanatory paragraph
Fixed merge conflicts