begin trying some minor diff-marked edits