remove duplicate update method and fix upload bug
fix merge conflict