fix updater class
fix merge conflict