patch to CFG global
empty folders so you guys don't get stupid erros...
resolve merge conflict