Hopefully fixed git related issues. No changes to the actual project.