Resolve conflicts resulting from subtree pull of ob_starter upstream