change html file
conflict fix after merge html with style