Conflict-Free Diamond