re-added config files
Merge commit 'HEAD@{1}'