just a comment and a suggestion so that we don't clobber each other on
3-way merges in dev options anymore.