fixed merge conflicts.

Pods/Onboard/Source/OnboardingContentViewController.h

@@ -201,10 +201,7 @@ NS_ASSUME_NONNULL_END
  */
 - (nonnull instancetype)initWithTitle:(nullable NSString *)title body:(nullable NSString *)body image:(nullable UIImage *)image videoURL:(nullable NSURL *)videoURL buttonText:(nullable NSString *)buttonText actionBlock:(nullable action_callback)actionBlock;
 
-<<<<<<< HEAD
-=======
 - (nonnull instancetype)initWithTitle:(nullable NSString *)title body:(nullable NSString *)body image:(nullable UIImage *)image videoURL:(nullable NSURL *)videoURL inputView:(nullable UIView *)inputView buttonText:(nullable NSString *)buttonText actionBlock:(nullable action_callback)actionBlock;
->>>>>>> eb9542c70251e074f35bc20a9257b4f829892cc9
 
 /**
  * @brief Method used to update the alpha value for all floating subviews (image, title, body, etc.)

Pods/Onboard/Source/OnboardingContentViewController.m

@@ -31,10 +31,7 @@ static CGFloat const kMainPageControlHeight = 35;
 NSString * const kOnboardMainTextAccessibilityIdentifier = @"OnboardMainTextAccessibilityIdentifier";
 NSString * const kOnboardSubTextAccessibilityIdentifier = @"OnboardSubTextAccessibilityIdentifier";
 NSString * const kOnboardActionButtonAccessibilityIdentifier = @"OnboardActionButtonAccessibilityIdentifier";
-<<<<<<< HEAD
-=======
 NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAccessibilityIdentifier";
->>>>>>> eb9542c70251e074f35bc20a9257b4f829892cc9
 
 @interface OnboardingContentViewController ()
 
@@ -74,13 +71,11 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc
     return [[self alloc] initWithTitle:title body:body videoURL:videoURL buttonText:buttonText action:action];
 }
 
-<<<<<<< HEAD
-=======
+
 + (instancetype)contentWithTitle:(NSString *)title body:(NSString *)body videoURL:(NSURL *)videoURL inputView:(UIView *)inputView buttonText:(NSString *)buttonText action:(dispatch_block_t)action {
     return [[self alloc] initWithTitle:title body:body videoURL:videoURL buttonText:buttonText action:action];
 }
 
->>>>>>> eb9542c70251e074f35bc20a9257b4f829892cc9
 - (instancetype)initWithTitle:(NSString *)title body:(NSString *)body videoURL:(NSURL *)videoURL  buttonText:(NSString *)buttonText action:(dispatch_block_t)action {
     return [self initWithTitle:title body:body image:nil videoURL:videoURL buttonText:buttonText actionBlock:^(OnboardingViewController *onboardController) {
         if (action) {