Resolving conflicts
resolving