committing
resolving conflict