Resolved conflicts after rebasing

Author: ppham27

src/lib/select/select.ts

@@ -636,7 +636,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   private _selectValue(value: any, isUserInput = false): MdOption|undefined {
     const optionsArray = this.options.toArray();
 
-    const findOption = (option: MdOption) => {
+    const correspondingOption = optionsArray.find((option: MdOption) => {
       try {
         return this._compareWith(option.value,  value);
       } catch (error) {
@@ -646,8 +646,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
         }
         return false;
       }
-    };
-    const correspondingOption = optionsArray.find(findOption);
+    });
 
     if (correspondingOption) {
       isUserInput ? correspondingOption._selectViaInteraction() : correspondingOption.select();