fixed merge conflicts round 2

Sources/MotionContext.swift

@@ -272,6 +272,7 @@ public extension MotionContext {
         } else {
         } else {
           snapshot = view.snapshotView() ?? UIView()
           snapshot = view.snapshotView() ?? UIView()
         }
         }
+      
       #endif
       #endif
     }
     }
     
     
@@ -279,6 +280,7 @@ public extension MotionContext {
       if let imageView = view as? UIImageView, imageView.adjustsImageWhenAncestorFocused {
       if let imageView = view as? UIImageView, imageView.adjustsImageWhenAncestorFocused {
         snapshot.frame = imageView.focusedFrameGuide.layoutFrame
         snapshot.frame = imageView.focusedFrameGuide.layoutFrame
       }
       }
+    
     #endif
     #endif
     
     
     view.layer.cornerRadius = oldCornerRadius
     view.layer.cornerRadius = oldCornerRadius

Sources/Transition/MotionTransition+Start.swift

@@ -238,18 +238,18 @@ fileprivate extension MotionTransition {
   func processAnimation() {
   func processAnimation() {
     #if os(tvOS)
     #if os(tvOS)
       animate()
       animate()
-    
+
     #else
     #else
-    if isNavigationController {
-      // When animating within navigationController, we have to dispatch later into the main queue.
-      // otherwise snapshots will be pure white. Possibly a bug with UIKit
-      Motion.async { [weak self] in
-        self?.animate()
+      if isNavigationController {
+        // When animating within navigationController, we have to dispatch later into the main queue.
+        // otherwise snapshots will be pure white. Possibly a bug with UIKit
+        Motion.async { [weak self] in
+          self?.animate()
+        }
+        
+      } else {
+        animate()
       }
       }
-      
-    } else {
-      animate()
-    }
     
     
     #endif
     #endif
   }
   }