Add section about conflicts