Merging nconf changes