Fixed another git issues

I made a mistake using git, but it's all fixed now.