Tabs: Fix text and typo

Closes gh-369

Author: agcolom

pages/tabs.html

@@ -7,9 +7,8 @@
 	}
 }</script>
 
-<<<<<<< HEAD
 <h2 id="introduction">Tabs</h2>
-<p>The jQuery UI tabs widget is bundled unchanged with jQuery Mobile. Thus, it's <a href="//api.jqueryui.com/tabs/">API documentation</a> fully describes its functionality.</p>
+<p>The jQuery UI tabs widget is bundled unchanged with jQuery Mobile. Thus, its <a href="//api.jqueryui.com/tabs/">API documentation</a> fully describes its functionality.</p>
 <h2 id="options-and-autoinit">Options and autoinitialization</h2>
 <p>When used with jQuery Mobile's autoinitialization features, the options documented on the widget's API documentation page can also be provided as <code>data-*</code> attributes in the markup. You can add the <code>data-role="tabs"</code> attribute to your tabs widget markup to indicate that the element is to be turned into a tabs widget.</p>
 <h2 id="ajax">Ajax considerations</h2>