diff --git a/installcommand.cpp b/installcommand.cpp
index d6e95c8d..2a67e826 100644
--- a/installcommand.cpp
+++ b/installcommand.cpp
@@ -1,5 +1,3 @@
-<<<<<<< HEAD   (fc79aa Encryption: don't try wrapped key if not needed)
-=======
 /*
  * Copyright (C) 2007 The Android Open Source Project
  *