merge post-encyclopedie template edits