Minor bug fix, commenting and docstrings

Fixed a bug where the application could crash when loading a different
conflict if a conflict was already loaded.