Shelly html
Conflicts resolved