remove an obsolete comment
merge