resolved the conflicts in the README

Author: Terieyenike

README.md

@@ -1,7 +1,6 @@
 # Free Developer Resources
 
 ### Categories :
-<<<<<<< HEAD
 
 - [Free Developer Resources](#free-developer-resources)
   - [Categories :](#categories-)
@@ -59,59 +58,7 @@
   - [Blogs](#blogs)
 
 ### Resources :
-||||||| merged common ancestors
-- [Accessibility](#accessibility)
-- [Design](#design)
-  - [Design Inspiration](#design-inspiration)
-  - [Design Tools](#design-tools)
-  - [Wireframe & Mockups](#wireframe--mockups)
-  - [Templates](#templates)
-  - [Fonts](#fonts)
-  - [Colors](#colors)
-    - [Color Palettes](#color-palettes)
-    - [Gradients](#gradients)
-  - [Photos](#photos)
-  - [Icons](#icons)
-  - [Illustrations](#illustrations)
-  - [Patterns](#patterns)
-  - [Image Compression](#image-compression)
-  - [Background Remover](#background-remover)
-- [CSS](#css)
-  - [CSS Frameworks](#css-frameworks)
-  - [CSS Tools](#css-tools)
-- [Generators](#generators)
-- [Converters](#converters)
-- [Validation & Compatibility](#validation--compatibility)
-- [In-Browser Coding](#in-browser-coding)
-- [APIs](#apis)
-- [Developer Tools](#developer-tools)
-- [Chrome Extensions](#chrome-extensions)
-- [Domain Name Search Engine](#domain-name-search-engine)
-- [Hosting](#hosting)
-- [Database](#database)
-- [Authentication](#authentication)
-- [Responsiveness](#responsiveness)
-- [Site Analyzers](#site-analyzers)
-- [Project Management](#project-management)
-- [Speed Test](#speed-test)
-- [Documentation](#documentation)
-- [RoadMaps](#roadmaps)
-- [YouTube Channels](#youtube-channels)
-  - [General Web Dev](#general-web-dev)
-  - [Design & Front-End](#design--front-end)
-  - [Career & Advice](#career--advice)
-  - [DevOps](#devops)
-  - [Mobile](#mobile)
-  - [Blockchain](#blockchain)
-  - [Back End](#back-end)
-- [Books / Courses](#books--courses)
-- [Newsletters](#newsletters)
-- [Podcasts](#podcasts)
-- [Blogs](#blogs)
 
-
-### Resources : 
-=======
 - [Accessibility](#accessibility)
 - [Design](#design)
   - [Design Inspiration](#design-inspiration)
@@ -162,9 +109,7 @@
 - [Blogs](#blogs)
 - [Practise Tools](#Practise)
 
-
-### Resources : 
->>>>>>> upstream/master
+### Resources :
 
 ## Accessibility
 
@@ -316,6 +261,7 @@
 - [Tailwind Cheat-Sheet](https://nerdcave.com/tailwind-cheat-sheet)
 
 ### CSS Tools
+
 - [flexbox](https://flexbox.io/)
 - [CSS GRID](https://cssgrid.io/)
 - [cssmastery](https://estelle.github.io/cssmastery/#slide1)
@@ -610,6 +556,7 @@
 - [Python Engineer](https://www.youtube.com/channel/UCbXgNpp0jedKWcQiULLbDTA)
 
 ## Books / Courses
+
 - [Functional-Light JavaScript](https://github.com/getify/Functional-Light-JS)
 - [Eloquent JavaScript 3rd Edition](https://eloquentjavascript.net/)
 - [You Don't Know JS](https://github.com/getify/You-Dont-Know-JS)
@@ -650,16 +597,13 @@
 - [LogRocket](https://blog.logrocket.com)
 - [React Blog](https://reactjs.org/blog)
 - [Scotch.io](https://scotch.io)
-- [Smashing Magazine](https://www.smashingmagazine.com)
-<<<<<<< HEAD
+- [Smashing Magazine](https://www.smashingmagazine.co
 - [Tania Rascia](https://www.taniarascia.com/)
 - [Edidiong Asikpo](https://edidiongasikpo.com/)
 - [Bolaji Ayodeji](https://blog.bolajiayodeji.com/)
 - [Catalin Pit](https://catalins.tech/)
-||||||| merged common ancestors
-=======
 
 ## Practise
+
 - [30 Day Vanilla JS Coding Challenge](https://javascript30.com/)
 - [Clean-code in JS](https://github.com/ryanmcdermott/clean-code-javascript)
->>>>>>> upstream/master