testing
Merge https://github.com/shotdead/default-conf
merge