FIX: SHOULD ALWAYS COPY GIT CONFs
Merge branch 'fix-git' into develop
Merge branch 'develop'