fixing git weirdness