Fixes #74
Fixes #75

This addresses the issue of having to deal with a no-conflicted tab.