Clean up bad merge
Close open divs