Gui conflict display

Closes #500.
Built on #498 so that should be merged first.