resolving conflict
resolving conflict