updates from merged wiki content