fix: unresolved merge conflict and pr feedback

Author: crisbeto

src/lib/menu/menu-directive.ts

@@ -36,7 +36,7 @@ import {merge} from 'rxjs/observable/merge';
 import {Observable} from 'rxjs/Observable';
 import {Direction} from '../core';
 
-/** Default `md-menu` options that can be overriden. */
+/** Default `md-menu` options that can be overridden. */
 export interface MdMenuDefaultOptions {
   xPosition: MenuPositionX;
   yPosition: MenuPositionY;

src/lib/menu/menu.spec.ts

@@ -888,7 +888,7 @@ describe('MdMenu default overrides', () => {
     }).compileComponents();
   }));
 
-  it('should allow for the default menu options to be overriden', () => {
+  it('should allow for the default menu options to be overridden', () => {
     const fixture = TestBed.createComponent(SimpleMenu);
     fixture.detectChanges();
     const menu = fixture.componentInstance.menu;
@@ -911,11 +911,7 @@ describe('MdMenu default overrides', () => {
 class SimpleMenu {
   @ViewChild(MdMenuTrigger) trigger: MdMenuTrigger;
   @ViewChild('triggerEl') triggerEl: ElementRef;
-<<<<<<< HEAD
   @ViewChild(MdMenu) menu: MdMenu;
-=======
-  @ViewChild('menu') menu: MdMenu;
->>>>>>> feat(menu): add injection token for overriding the default options
   closeCallback = jasmine.createSpy('menu closed callback');
 }