resolving conflicts.