diff --git a/debian/control b/debian/control
index 22199a39..4913d676 100644
--- a/debian/control
+++ b/debian/control
@@ -225,15 +225,9 @@ Description: clang library - Development package
 Package: libclang-common-3.4-dev
 Architecture: any
 Section: libdevel
-<<<<<<< .courant
-Depends: ${misc:Depends}, libllvm3.4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 (= ${binary:Version})
 Replaces: llvm-3.4-dev (<< 1:3.2repack), libclang-3.4-dev
 Breaks: llvm-3.4-dev (<< 1:3.2repack)
-=======
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.3 (= ${binary:Version})
-Replaces: llvm-3.3-dev (<< 1:3.2repack), libclang-3.3-dev
-Breaks: llvm-3.3-dev (<< 1:3.2repack)
->>>>>>> .fusion-droit.r834
 Description: clang library - Common development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
  for the LLVM compiler. Some of its goals include the following: