merge small edits