Edits to merge