Fixed conflicted changelog.
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index c1ee37f..95270fe 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -84,6 +84,8 @@
<li>Libraries
<ul>
<li>Altered Session to use a longer match against the user_agent string. See upgrade notes if using database sessions.</li>
+ <li class="reactor">Added <kbd>is_unique</kbd> to the <a href="libraries/form_validation.html">Form Validation library</a>.</li>
+ <li class="reactor">Added <kbd>$this->db->set_dbprefix()</kbd> to the <a href="database/queries.html">Database Driver</a>.</li>
</ul>
</li>
</ul>
diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html
index f9f9680..4c1ddfe 100644
--- a/user_guide/database/queries.html
+++ b/user_guide/database/queries.html
@@ -80,11 +80,16 @@
It simply lets you submit a query. Most users will rarely use this function.</p>
-<h1>Adding Database prefixes manually</h1>
-<p>If you have configured a database prefix and would like to add it in manually for, you can use the following.</p>
+<h1>Working with Database prefixes manually</h1>
+<p>If you have configured a database prefix and would like to prepend it to a table name for use in a native SQL query for example, then you can use the following:</p>
<p><code>$this->db->dbprefix('tablename');<br />
// outputs prefix_tablename</code></p>
+<p>If for any reason you would like to change the prefix programatically without needing to create a new connection, you can use this method:</p>
+<p><code>$this->db->set_dbprefix('newprefix');<br /><br />
+$this->db->dbprefix('tablename');<br />
+// outputs newprefix_tablename</code></p>
+
<h1>Protecting identifiers</h1>
<p>In many databases it is advisable to protect table and field names - for example with backticks in MySQL. <strong>Active Record queries are automatically protected</strong>, however if you need to manually protect an identifier you can use:</p>