resolving conflict

resolving conflict