remerge minor edits