resolving conflict 2