Missed a merge conflict LIKE A BOSS^W IDIOT

docs/contributing.rst

@@ -61,17 +61,10 @@ will verify for every pull request that it compiles and tests pass.
 Running Rubyspecs
 ~~~~~~~~~~~~~~~~~
 
-<<<<<<< HEAD
-To run Rubyspecs, you can use the provided `Invoke`_ tasks (executed via the
-``invoke`` or ``inv`` command). The rubyspec and mspec repositories have to be
-checked out next to your topaz repository, the spec tasks will clone them for
-you if they aren't already there.
-=======
-To run Rubyspecs, you can use the provided ``fab`` tasks. To get ``fab`` you
-must have `Fabric`_ installed. The `rubyspec`_ and `mspec`_
+To run Rubyspecs, you can use the provided ``invoke`` tasks. To get ``invoke`` you
+must have `Invoke`_ installed. The `rubyspec`_ and `mspec`_
 repositories have to be checked out next to your topaz repository, the spec
 tasks will clone them for you if they aren't already there.
->>>>>>> upstream/master
 
 To just run all specs that should pass::