progress view
merge