resolving conflict
conflict resolved