hopfully sorted git issues