merged_tree: don't add empty subtree to parent, remove canceling terms prior to resolving file-level conflict

merged_tree: don't add empty subtree to parent, remove canceling terms prior to resolving file-level conflict #4588