Resolving conflict #2