diff --git a/backstage/about.php b/backstage/about.php
index 4b57278c8..8e519e507 100755
--- a/backstage/about.php
+++ b/backstage/about.php
@@ -28,27 +28,7 @@
-<<<<<<< HEAD
1.3 Preview 1
Denim
-=======
-
1.2.3
Cornflower Blue Update 3
-
- Improved
Improved security on token hash
- Improved
Pruning forums will now also decrease the comment count
- Improved
General UI improvements in Backstage
- Fixed
Fixes multiple issues with SQLite 3 support
- Fixed
Fixes 5 other bugs
-
-
-
-
1.2.2
Cornflower Blue Update 2
-
- Fixed
Reissues the 1.2.1 update
-
-
-
-
1.2.1
Cornflower Blue Update
->>>>>>> version1.2
New
Sixteen is a new default theme
New
You can now mark a thread as important
diff --git a/include/functions.php b/include/functions.php
index 7da0074a8..020c04dc6 100755
--- a/include/functions.php
+++ b/include/functions.php
@@ -180,13 +180,9 @@ function prune($forum_id, $prune_pinned, $prune_date) {
while ($row = $db->fetch_row($result))
$comment_ids .= (($comment_ids != '') ? ',' : '').$row[0];
-<<<<<<< HEAD
if ($comment_ids != '') {
-=======
- if ($post_ids != '') {
// Decrease the commentcount for users
- decrease_post_counts($post_ids);
->>>>>>> version1.2
+ decrease_comment_counts($post_ids);
// Delete threads
$db->query('DELETE FROM '.$db->prefix.'threads WHERE id IN('.$thread_ids.')') or error('Unable to prune threads', __FILE__, __LINE__, $db->error());
// Delete subscriptions