Trying to fix git stuff and failing :(