extra test
only combine columns when the merges also do not overlap
Merge branch 'feature/wider-overlap' into develop