Fixed some git weirdness