improvements to the conflicts page