Add conflict resolution in the library when notes are synced

[rashoodkhan]

At the moment, there is no conflict resolution technique in the library. Since the OSX app has integrated the File System Sync, which is working perfectly well, it would be good to have the conflict resolution in place.