Silvia [Hiro]:
Hi, thanks for letting me know. I have fixed the merge conflicts myself and merged.
Since the page did no longer build after "Fix merge conflicts in sidenav" https://gitweb.torproject.org/project/web/webwml.git/commit/?id=c257c6ccac16...
I attempted to fix this with my comment and branch at https://trac.torproject.org/projects/tor/ticket/24881#comment:7
Do you have time to look into this?
I'd like to get this fixed before submitting upcoming patches and I'd like to get them deployed before Alison is going to release an upcoming blog post.
thanks, nusenu