[FIX] html

conflict resolved