delete useless views
fix conflict