minor edits
merge conflict fix