OD: Separate clash details and clashSet details
OD: store/revive clash set