completed config merge functionality and tests