git weirdness to fix