minor merge-related edits