Resolve conflict
Conflict