Fix merge error.
Fix updater.