fix leak of private comments into public
merge conflicts