fixed merge errors

![tumblr_inline_mnjr7368qj1qz4rgp](https://cloud.githubusercontent.com/assets/755201/5018529/810405c2-6a85-11e4-9dc2-b3385a0f1150.gif)