diff --git a/Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/moritanaoki.xcuserdatad/UserInterfaceState.xcuserstate b/Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/moritanaoki.xcuserdatad/UserInterfaceState.xcuserstate
index ef8b6dd..8ef1830 100644
Binary files a/Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/moritanaoki.xcuserdatad/UserInterfaceState.xcuserstate and b/Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/moritanaoki.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/README.md b/README.md
index 2134b7a..063112c 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,13 @@
 # SwiftRefresher
 
+<<<<<<< HEAD
 [![Version](https://img.shields.io/cocoapods/v/SwiftRefresher.svg?style=flat)](http://cocoadocs.org/docsets/SwiftRefresher) [![License](https://img.shields.io/cocoapods/l/SwiftRefresher.svg?style=flat)](http://cocoadocs.org/docsets/SwiftRefresher) [![Platform](https://img.shields.io/cocoapods/p/SwiftRefresher.svg?style=flat)](http://cocoadocs.org/docsets/SwiftRefresher)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/morizotter/SwiftRefresher)
 
 `UIRefreshControl` on UIViewController's UITableView works strange. SwiftRefresher is on of the alternatives of UIRefreshControl.
+=======
+`UIRefreshControl` on UIViewController's UITableView works strange. SwiftRefresher is one of the alternatives of UIRefreshControl.
+>>>>>>> 6790ee3646c31b62e234d8449853c45eaae23e66
 
 ![refresher.gif](refresher.gif)