resolved conflicts

Author: tinayuangao

src/lib/checkbox/checkbox.ts

@@ -91,13 +91,17 @@ export class MdCheckbox implements ControlValueAccessor {
   @Input() id: string = `md-checkbox-${++nextId}`;
 
   /** Whether the ripple effect on click should be disabled. */
-  @Input() @BooleanFieldValue() disableRipple: boolean = false;
+  private _disableRipple: boolean;
+
+  @Input()
+  get disableRipple(): boolean { return this._disableRipple; }
+  set disableRipple(value) { this._disableRipple = coerceBooleanProperty(value); }
 
   /** ID to be applied to the `input` element */
   get inputId(): string {
     return `input-${this.id}`;
   }
-  
+
   private _required: boolean;
 
   /** Whether the checkbox is required or not. */