reviews new view
fix conflict