Finally fixing freaken git errrors