diff --git a/spec/ParseAPI.spec.js b/spec/ParseAPI.spec.js
index f8dcc058..cceb818f 100644
--- a/spec/ParseAPI.spec.js
+++ b/spec/ParseAPI.spec.js
@@ -1170,6 +1170,4 @@ describe('miscellaneous', function() {
       done();
     });
   });
-=======
->>>>>>> Prevent untransforming inner object keys named _p_*
 });