merge discourse updates