made edit angular changes
solve merge conflicts