Updated README

Author: UnderlineWords

README.md

@@ -7,28 +7,14 @@
 
 ### Features
 * Clean code, Simple enough and Fully customizable (grid number, class names, breakpoints etc.)
-<<<<<<< HEAD
 * CSS Grid based, no longer Flexbox (since v1.3.0)
-=======
-* CSS Grid based, no longer Flexbox
->>>>>>> 577dc6f2ad44f4112d83afa4f2bbb624bd573728
 * Viewport breakpoints
 * Column offsets
 * Equal height columns
 
 ### TODO
-<<<<<<< HEAD
-<<<<<<< HEAD
-- [ ] Fix responsive columns
-- [ ] Fix offset columns
-=======
-- [ ] Fix offset columns
-- [x] Fix responsive columns
->>>>>>> Optimized grider.scss
-=======
 - [ ] Fix offset columns
 - [x] Fix responsive columns
->>>>>>> 577dc6f2ad44f4112d83afa4f2bbb624bd573728
 - [x] Remove spaces between columns
 - [x] Equal height columns
 - [x] Viewport breakpoints