Remove bookmarklet from Markdown
Fix conflicts