student progress bar
merge conflict progress bar