Fixing the conflict
Fixing conflict