Update config.php
decoration-1
...
merge conflict