Minor text edits
more text edits
Resolve conflict