Git madness ending hopefully