added some git diff stuff