correcting some lovely git errors