Fixing merge change