Fixing merge errors.