maker some changes to the  angular experiment
fix merge conflict