Fixed typos in README.md

README.md

@@ -3,11 +3,7 @@
 ## Description
 Paint toy project to draw shapes. More practice on design patterns. 
 
-<<<<<<< HEAD
 <img src="https://i.imgur.com/kzzao6g.png" width=50% height=50%>
-=======
-![JPaint](https://i.imgur.com/kzzao6g.png){width=50%, height:50%}
->>>>>>> 26b1e277880e38dfe6cc63314c06189fa552531c
 
 ## How to run the code locally