add angular js
fix conflict