minor edits
merge