progress
title bar
Merge remote-tracking branch 'origin/master'
updates progress bars
merge conflicts resolved
updates