merging in angular changes