Tabun fixes: less conflicts for scrollToComment enhancement