fixing some git issues