Well, the conflicting version was the only one I found. I put it back in the correct notebook. @Evernote: The HELP search function should be able to turn up something intelligible when you enter the word "conflicting".
A Note To Evernote Team; At least add some text to the HELP menu explaining what a conflicting change is and showing some ideas on how to deal with them. The forums are not supposed to be used for training on "common" functions. I just had a brand new document disappear, because it became a conflcting change. I would love to see some clear guidence on how to "cleanly" recover it.