add angular related code
fix merge conflict and add a bit of angular code