project CRUD set
angular set up conflict slove