Finish progress bar without button
Merge conflict