Creating conflict
Fixing conflict