Minor edits.
Fix merge conflict.