fix tmp dir naming for conflicts