fixed conflict in change log items
git stash conflict
global config file /etc/sparforte_config working, docs