Resolving conflict
conflict