Creating conflict
Resolved conflict