fix merge errors

JensRavens · Sep 26, 2016 · d86a494 · d86a494
1 parent 9311405
commit d86a494
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Sources/Observable.swift b/Sources/Observable.swift
@@ -164,15 +164,15 @@ extension Observable {
         return observable
     }
 
-    public func merge<U>(merge: Observable<U>) -> Observable<(T,U)> {
+    public func merge<U>(_ merge: Observable<U>) -> Observable<(T,U)> {
         let signal = Observable<(T,U)>()
         self.subscribe { a in
-            if let b = merge.peek() {
+            if let b = merge.value {
                 signal.update((a,b))
             }
         }
         merge.subscribe { b in
-            if let a = self.peek() {
+            if let a = self.value {
                 signal.update((a,b))
             }
         }