angular working
mergeshiat