Proper configuration merge