hopefully fixed git errors