Only open one MergeConflictsView.
Merge pull request #15 from smashwilson/there-can-only-be-one

Only open one MergeConflictsView at a time.