conflict reso, two-column layout in base.html
futzing with layout