finish task view
fix conflict