Minor edits
Resolve conflicts: