I’ve found the best way to get rid of conflicts around offshoregit is to disable or uninstall the old repositories (like Fusion).