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