What am I doing about conflicts?