deliberately create a conflict
Resolve conflict