about edits
resolving conflicts