fix htmlpath
fix conflict