Simulate Conflict
Conflict resolved