diff -Nru puppet-2.6.4/debian/changelog puppet-2.6.4/debian/changelog
--- puppet-2.6.4/debian/changelog	2011-02-08 14:48:41.000000000 +0000
+++ puppet-2.6.4/debian/changelog	2011-03-01 17:22:36.000000000 +0000
@@ -1,3 +1,10 @@
+puppet (2.6.4-2ubuntu2) natty; urgency=low
+
+  * debian/puppetmaster.default
+    - fix remains of automated merge (LP: #726856)
+
+ -- Andreas Moog <amoog@ubuntu.com>  Tue, 01 Mar 2011 14:04:06 +0100
+
 puppet (2.6.4-2ubuntu1) natty; urgency=low
 
   * Merge from debian unstable.  Remaining changes:
diff -Nru puppet-2.6.4/debian/puppetmaster.default puppet-2.6.4/debian/puppetmaster.default
--- puppet-2.6.4/debian/puppetmaster.default	2011-02-08 00:28:42.000000000 +0000
+++ puppet-2.6.4/debian/puppetmaster.default	2011-03-01 17:20:23.000000000 +0000
@@ -36,7 +36,3 @@
 # port 8140 and change the below number to something else, such as
 # 18140.
 PORT=8140
-<<<<<<< puppet-2.6.3-0ubuntu1 (ubuntu)
-=======
-
->>>>>>> puppet-2.6.4-2 (debian)