Keep original notebook on note conflict

If Laurent is still reading this thread, please consider not logging the cipher text, public, and private keys in the world-readable log file.

I just checked my log.txt file and I can't find mention of my master password :thinking: Maybe it is fixed?