fix merge conflict
RFT: changed some more bookmarkS to bookmark, so that it now works again
FIX: merge conflict