add merge-configuration support