To update a config file:

$ cp old.conf updated.conf
$ merge -A updated.conf new.conf old.conf

Then edit updated.conf and resolve merge conflicts then deploy updated.conf.