Conflict-free diamond