Added conflict information