Tree conflict

Done.

Dear Anne, thank you! Could you explain me about problem and how do you solve it?

There wasn’t really a conflict. Just a sort of residual notice, after the merge. Happens sometimes.

I fixed it by clicking on the yellow exclamation point signifying a conflict. The box with relations came up. There were no duplicates, so I clicked on the assign parents link. There were no problems with the parents so I didn’t have to choose any. The system simply stopped showing that there was a conflict.

Thank you dear Anne! I’m smart now :)