Update colspan
Merge pull request #161 from tablexi/reconcile-layout

Update colspan