diff --git a/Gemfile.lock b/Gemfile.lock
index 4012d8a054..98ec2d9b61 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,7 +11,7 @@ PATH
     tapioca (0.7.0)
       bundler (>= 1.17.3)
       pry (>= 0.12.2)
-      rbi (~> 0.0.0, >= 0.0.12)
+      rbi (~> 0.0.0, >= 0.0.14)
       sorbet-runtime (>= 0.5.9204)
       sorbet-static (>= 0.5.9204)
       spoom (~> 1.1.0, >= 1.1.4)
@@ -225,9 +225,9 @@ GEM
       thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    rbi (0.0.12)
+    rbi (0.0.14)
       ast
-      parser
+      parser (>= 2.6.4.0)
       sorbet-runtime (>= 0.5.9204)
       unparser
     redis (4.6.0)
diff --git a/sorbet/rbi/gems/rbi@0.0.12.rbi b/sorbet/rbi/gems/rbi@0.0.14.rbi
similarity index 98%
rename from sorbet/rbi/gems/rbi@0.0.12.rbi
rename to sorbet/rbi/gems/rbi@0.0.14.rbi
index 343cf112cc..2b6e11870a 100644
--- a/sorbet/rbi/gems/rbi@0.0.12.rbi
+++ b/sorbet/rbi/gems/rbi@0.0.14.rbi
@@ -725,7 +725,16 @@ class RBI::Loc
   sig { returns(T.nilable(String)) }
   def file; end
 
+<<<<<<<< HEAD:sorbet/rbi/gems/rbi@0.0.12.rbi
   sig { returns(String) }
+|||||||| parent of 66cd8d7 (Merge pull request #866 from Shopify/at-bump-rbi):sorbet/rbi/gems/rbi@0.0.13.rbi
+  sig { returns(::String) }
+========
+  sig { returns(T.nilable(::String)) }
+  def source; end
+
+  sig { returns(::String) }
+>>>>>>>> 66cd8d7 (Merge pull request #866 from Shopify/at-bump-rbi):sorbet/rbi/gems/rbi@0.0.14.rbi
   def to_s; end
 
   class << self
@@ -2145,6 +2154,9 @@ class RBI::TreeBuilder < ::RBI::ASTVisitor
   end
   def initialize(file:, comments: T.unsafe(nil), nodes_comments_assoc: T.unsafe(nil)); end
 
+  sig { returns(T.nilable(::AST::Node)) }
+  def last_node; end
+
   sig { void }
   def post_process; end
 
@@ -2245,6 +2257,17 @@ class RBI::TypeMember < ::RBI::NodeWithComments
   def value; end
 end
 
+class RBI::UnexpectedParserError < ::StandardError
+  sig { params(parent_exception: ::Exception, last_location: ::RBI::Loc).void }
+  def initialize(parent_exception, last_location); end
+
+  sig { returns(::RBI::Loc) }
+  def last_location; end
+
+  sig { params(io: T.any(::IO, ::StringIO)).void }
+  def print_debug(io: T.unsafe(nil)); end
+end
+
 RBI::VERSION = T.let(T.unsafe(nil), String)
 
 # Visibility
diff --git a/tapioca.gemspec b/tapioca.gemspec
index b815dde0ac..f7eb1ff2ab 100644
--- a/tapioca.gemspec
+++ b/tapioca.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency("bundler", ">= 1.17.3")
   spec.add_dependency("pry", ">= 0.12.2")
-  spec.add_dependency("rbi", "~> 0.0.0", ">= 0.0.12")
+  spec.add_dependency("rbi", "~> 0.0.0", ">= 0.0.14")
   spec.add_dependency("sorbet-runtime", ">= 0.5.9204")
   spec.add_dependency("sorbet-static", ">= 0.5.9204")
   spec.add_dependency("spoom", "~> 1.1.0", ">= 1.1.4")