Resolve conflict #2