progress bar
fixed merge