Cleanup master -- reposition merged divs

Cleanup master -- reposition merged divs, now merge into master