resolving conflicts?