Figure out a way to resolve conflicts.

[e2crawfo]

When a note is being viewed in two different terminals, whichever is closed last will overwrite whats gets written by the other. Need to fix this. When saving a note, it should probably check whether the current contents of the note on disk is the same as what it has in memory. If not, launch a merge tool to resolve the conflict.