add documentation of existing merge behavior
document new config merge behavior