Added conflict text