txt edits
merge