start treating raise_clash and handle_clash more properly

the automation for handle_clash is broken currently though