diff --git a/debian/changelog b/debian/changelog
index a497da2..20293f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+<<<<<<< debian/changelog
+=======
+libcommons-lang-java (2.6-6ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Revert to using Ant instead of Maven for package build for
+      continued inclusion in Ubuntu main.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Wed, 17 Feb 2016 16:10:33 -0800
+
+libcommons-lang-java (2.6-6) unstable; urgency=medium
+
+  * Team upload.
+  * Transition to bnd 2.1.0. Fix obsolete bnd parameter syntax in
+    debian/rules.
+  * wrap-and-sort -sa.
+  * Vcs-Browser: Use https.
+
+ -- Markus Koschany <apo@debian.org>  Tue, 17 Nov 2015 16:09:31 +0100
+
+>>>>>>> debian/changelog
 libcommons-lang-java (2.6-5ubuntu1) wily; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff --git a/debian/control b/debian/control
index 0d2eec0..1c83f9a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,36 @@ Section: java
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+<<<<<<< debian/control
 Uploaders: Emmanuel Bourg <ebourg@apache.org>
 Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-repo-helper (>= 1.7), ant
 Build-Depends-Indep: junit (>= 3.8.1), default-jdk-doc
+=======
+Uploaders:
+ Emmanuel Bourg <ebourg@apache.org>
+Build-Depends:
+ ant,
+ cdbs,
+ debhelper (>= 9),
+ default-jdk,
+ maven-repo-helper (>= 1.7)
+Build-Depends-Indep:
+ default-jdk-doc,
+ junit (>= 3.8.1),
+>>>>>>> debian/control
 Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-lang-java
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libcommons-lang-java
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/libcommons-lang-java
 Homepage: http://commons.apache.org/lang/
 
 Package: libcommons-lang-java
 Architecture: all
+<<<<<<< debian/control
 Depends: ${misc:Depends}
+=======
+Depends:
+ ${misc:Depends}
+>>>>>>> debian/control
 Description: Extension of the java.lang package
  The Lang Component contains a set of Java classes that provide helper
  methods for standard Java classes, especially those found in the
@@ -37,8 +56,15 @@ Description: Extension of the java.lang package
 Package: libcommons-lang-java-doc
 Section: doc
 Architecture: all
+<<<<<<< debian/control
 Depends: ${misc:Depends}
 Suggests: default-jdk-doc
+=======
+Depends:
+ ${misc:Depends}
+Suggests:
+ default-jdk-doc,
+>>>>>>> debian/control
 Description: Documentation for an extension of the java.lang package
  The Lang Component contains a set of Java classes that provide helper
  methods for standard Java classes, especially those found in the