Merge angular/music and movie changes