Added conflict displays