diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java
index 6d971a89cfb18..e11303d2db90b 100644
--- a/core/java/android/widget/AutoCompleteTextView.java
+++ b/core/java/android/widget/AutoCompleteTextView.java
@@ -259,7 +259,6 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
         mDropDownAnchorId = id;
         mDropDownAnchorView = null;
     }
-<<<<<<< HEAD:core/java/android/widget/AutoCompleteTextView.java
     
     /**
      * <p>Gets the background of the auto-complete drop-down list.</p>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 88eab615ee9c8..477ca3f27ef84 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -1108,5 +1108,5 @@
      =============================================================== -->
   <eat-comment />
 
-  <public type="attr" name="accountType" id="0x0101026c" />
+  <public type="attr" name="accountType" id="0x0101026d" />
 </resources>