Fixing merge conflict - 1