fixed reset
fix merge conflict
fix merge conflict2