Various changes

CliClient/tests/synchronizer.js

@@ -562,5 +562,22 @@ describe('Synchronizer', function() {
 
 		done();
 	});
+
+	it('should not try to delete on remote conflicted notes that have been deleted', async (done) => {
+		let f1 = await Folder.save({ title: "folder" });
+		let n1 = await Note.save({ title: "mynote", parent_id: f1.id });
+		await synchronizer().start();
+
+		await switchClient(2);
+
+		await synchronizer().start();
+		await Note.save({ id: n1.id, is_conflict: 1 });
+		await Note.delete(n1.id);
+		const deletedItems = await BaseItem.deletedItems();
+
+		expect(deletedItems.length).toBe(0);
+
+		done();
+	});
 	
 });