Fix merge cruft

* Fix merge cruft
* Remove excess div tag