hava some progress in progressbar
solve conflict