Properly merge configuration