Config scaffolding
Fix merge conflict