diff --git a/README.md b/README.md
index 3946324..4e28dd5 100644
--- a/README.md
+++ b/README.md
@@ -107,16 +107,12 @@ getButton(/*StylishAlertDialog.Button)Type*/)
 getButton(/*StylishAlertDialog.Button)Type*/).setBackgroundTintList()
 setCancellable(boolean cancellable)
 setCancelledOnTouchOutside(boolean cancelledOnTouchOutside)
-<<<<<<< HEAD
 setCustomView(View view, boolean withContent)
-=======
 setDismissOnClick(boolean dismissOnClick)
-
->>>>>>> 23dd967fa5b76fd9a240aa4e67c0572d1f54417f
 ```
-thanks to the project [materialish-progress](https://github.com/pnikosis/materialish-progress)
 
 Code Samples
+---
 
 Simple basic message：