Tagged conflict-free-diamonds