Remove extra static
Properly expand included config for merging with the local one