diff -Nru gdal-1.10.0/debian/changelog gdal-1.10.0/debian/changelog
--- gdal-1.10.0/debian/changelog	2013-07-05 15:47:37.000000000 +0000
+++ gdal-1.10.0/debian/changelog	2014-08-14 17:57:12.000000000 +0000
@@ -1,3 +1,9 @@
+gdal (1.10.0-1~precise2) precise; urgency=high
+
+  * Launchpad build for Precise
+
+ -- Jerome Villeneuve Larouche <jlarouche@mapgears.com>  Thu, 14 Aug 2014 13:57:01 -0400
+
 gdal (1.10.0-1~precise1) precise; urgency=high
 
   * Launchpad build for Precise.
@@ -64,15 +70,9 @@
 
   [ Francesco Paolo Lovergine ]
   * Reintroducing libgdal1-dev as a transitional package to allow r-deps
-<<<<<<< HEAD
-  to build in any environment.
-  * Removed old depndency on libcurl3-dev for libgdal-dev and
-  added a preferred dep on libcurl4-gnutls-dev to make lintian happy.
-=======
     to build in any environment.
   * Removed old dependency on libcurl3-dev for libgdal-dev and added a 
     preferred dep on libcurl4-gnutls-dev to make lintian happy.
->>>>>>> master
   * Added build-{arch|indep} targets in debian/rules.
   * Fixed a bit debian/changelog for latest changes. 
   * Now using libxerces-c-dev as dependency for current library version.