Remove incorrect reset of progress.
Resolve merge conflicts.