Fixing merge conflict