diff --git a/README.md b/README.md
index 06d83b4..facb57d 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,6 @@
 # GitPractise
+<<<<<<< HEAD
 lisi
+=======
+zhangsan
+>>>>>>> 3a35eae6b076aca03c24978ad5c8800579d45e80
diff --git a/src/DateTimePickerDialog.java b/src/DateTimePickerDialog.java
index 2c47ba4..d066458 100644
--- a/src/DateTimePickerDialog.java
+++ b/src/DateTimePickerDialog.java
@@ -67,6 +67,10 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
     public void set24HourView(boolean is24HourView) {
         mIs24HourView = is24HourView;
     }
+    
+    public void set12HourView(boolean is24HourView) {
+        mIs24HourView = is24HourView;
+    }
 
     public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) {
         mOnDateTimeSetListener = callBack;