Update README.md

Author: lsl-soft

README.md

@@ -3,11 +3,9 @@
 This is simple poll widget for yii2 framework.
 You can use both single and multiple answer.
 
-<<<<<<< HEAD
-([More information lslsoft.com](http://lslsoft.com/2017/01/22/simple-poll-widget-for-yii2/)
-=======
+
 ([More information: lslsoft.com](http://lslsoft.com/2017/01/22/simple-poll-widget-for-yii2/))
->>>>>>> origin/master
+
 
 ### Installing
 
@@ -156,11 +154,7 @@ CREATE TABLE `polls_result` (
 ) ENGINE=InnoDB;
 ```
 
-<<<<<<< HEAD
-
 
-=======
->>>>>>> origin/master
 ### Author
 
 * **Leonid Lyalin** 
@@ -169,18 +163,7 @@ CREATE TABLE `polls_result` (
 
 This project is licensed under the BSD-3-Clause
 
-<<<<<<< HEAD
-
-### Authors
-
-* **Leonid Lyalin** 
-
-
 ### Acknowledgments
-=======
-## Acknowledgments
->>>>>>> origin/master
-
 
 * Thanks to all Yii framework team for inspiration and special thanks to Alexander Makarov (@samdark)
 * Thanks to @Insolita for magic yii2-migrik