Improve yaml_merge

Was unnecessarily complex. Was not merging items that were in
primary but not in secondary