html added
html integration
conflict solved