deconflict drive_file s

[macMikey]

• [x] break it with a non-unique name
• [x] develop a tool to deconfilct might be able to do it by passing a path - if more than one match, error, and then dev can throw a path in, which we can traverse to deconflict.