Fix Merge Bug

Working on https://github.com/Netflix/RxJava/issues/1420