Test conflict
Resolve conflict