Minimize and restore the MergeConflictsView.
Mark it off in the README.
Merge pull request #14 from smashwilson/minify

Minimize and restore the MergeConflictsView.