resolving conflicts, etc.