Fixing git weirdness