Added GUI which allows you to see all the conflicts