Surround command and HTML navigation
Resolved merge conflict