Fix for note reference lost after local change prevails from a conflict
Fix for getting the merged data from the server after solvable conflict