two-col layout work and guides
conflict resolved