Fixin conflits in Angular files