Fixing merge error.