lint html cleanup
cleanup merge