more cleanup and refactoring

Author: wu-hui

firebase-firestore/src/main/java/com/google/firebase/firestore/util/CustomClassMapper.java

@@ -661,18 +661,10 @@ private static class BeanMapper<T> {
                     + method.getName());
           }
 
-          // OK to add since existingPropertyName == propertyName.
-          properties.put(propertyName.toLowerCase(Locale.US), propertyName);
-
-          // Handle `setter` update.
           Method existingSetter = setters.get(propertyName);
-          if (existingSetter == null) {
-            method.setAccessible(true);
-            setters.put(propertyName, method);
-            applySetterAnnotations(method);
-          } else if (!isSetterOverride(method, existingSetter)) {
-            // We require that setters with conflicting property names are
-            // overrides from a base class
+
+          // Raise exception if a conflict between setters is found.
+          if (existingSetter != null && !isSetterOverride(method, existingSetter)) {
             if (currentClass == clazz) {
               // TODO: Should we support overloads?
               throw new RuntimeException(
@@ -692,6 +684,13 @@ private static class BeanMapper<T> {
                       + ")");
             }
           }
+
+          // Make it accessible and process annotations if not yet.
+          if (existingSetter == null) {
+            method.setAccessible(true);
+            setters.put(propertyName, method);
+            applySetterAnnotations(method);
+          }
         }
 
         for (Field field : currentClass.getDeclaredFields()) {

firebase-firestore/src/main/java/com/google/firebase/firestore/util/DocumentId.java

@@ -23,7 +23,6 @@
 import java.lang.annotation.Target;
 
 /**
-<<<<<<< HEAD
  * Annotation used to mark a POJO property to be automatically populated with the document's ID when
  * the POJO is created from a Firestore document (e.g. via {@link DocumentSnapshot#toObject}).
  *