diff --git a/AsyncDisplayKit-Prefix.gcda b/AsyncDisplayKit-Prefix.gcda
index 7564c6c3f5..83c74d3faa 100644
Binary files a/AsyncDisplayKit-Prefix.gcda and b/AsyncDisplayKit-Prefix.gcda differ
diff --git a/AsyncDisplayKit/ASDisplayNode.h b/AsyncDisplayKit/ASDisplayNode.h
index 5c4d967051..cad8539ac8 100644
--- a/AsyncDisplayKit/ASDisplayNode.h
+++ b/AsyncDisplayKit/ASDisplayNode.h
@@ -27,7 +27,7 @@ typedef UIView * _Nonnull(^ASDisplayNodeViewBlock)();
 /**
  * UIView creation block. Used to create the backing view of a new display node.
  */
-typedef UIViewController *(^ASDisplayNodeViewControllerBlock)();
+typedef UIViewController * _Nonnull(^ASDisplayNodeViewControllerBlock)();
 
 /**
  * CALayer creation block. Used to create the backing layer of a new display node.
diff --git a/AsyncDisplayKit/ASTableView.h b/AsyncDisplayKit/ASTableView.h
index 5d7c977615..d3e2b05b51 100644
--- a/AsyncDisplayKit/ASTableView.h
+++ b/AsyncDisplayKit/ASTableView.h
@@ -361,9 +361,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-<<<<<<< HEAD
-NS_ASSUME_NONNULL_END
-=======
-@protocol ASTableViewDelegate <ASTableDelegate>;
+@protocol ASTableViewDelegate <ASTableDelegate>
 @end
->>>>>>> master
+
+NS_ASSUME_NONNULL_END
diff --git a/AsyncDisplayKit/ASViewController.m b/AsyncDisplayKit/ASViewController.m
index 519ac4b389..9679785558 100644
--- a/AsyncDisplayKit/ASViewController.m
+++ b/AsyncDisplayKit/ASViewController.m
@@ -18,12 +18,14 @@
 
 - (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
-  return [self initWithNode:nil];
+  ASDisplayNodeAssert(NO, @"ASViewController requires using -initWithNode:");
+  return [self initWithNode:[[ASDisplayNode alloc] init]];
 }
 
 - (instancetype)initWithCoder:(NSCoder *)aDecoder
 {
-  return [self initWithNode:nil];
+  ASDisplayNodeAssert(NO, @"ASViewController requires using -initWithNode:");
+  return [self initWithNode:[[ASDisplayNode alloc] init]];
 }
 
 - (instancetype)initWithNode:(ASDisplayNode *)node