solve conflict
solving conflict
Fix not persisting removal of bookmark.
Refactor/clarify mergeToDisk()
Refactor and clarify mergeToFreenet() too
Indenting.
Fix generics.
Comments.
Factor out more repetitive disk read code
Don't need to proceed here.
Fix error message.
Logging
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/multiple-indexes'