[fix] Better merging of configurations