get items list angular complete
fix conflict
fix conflict view
fix conflict space