Improvements in rat colider
Resolving conflicts