more edits
resolved conflicts