Creating conflict
Cogiton
Merge conflicts