Resolve conflict
Resolve conflict