Merge
amend
Now merging adjacent edits