fix progressbar, success goes to 100%
fix merge conflict