bookmark fixes
merge conflicts