Refactoring after introduction of collision