resolved the conflicts in the README

Author: Terieyenike

README.md

@@ -2,63 +2,6 @@
 
 ### Categories :
 
-- [Free Developer Resources](#free-developer-resources)
-  - [Categories :](#categories-)
-  - [Resources :](#resources-)
-  - [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)
-  - [Image Resources](#image-resources)
-    - [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)
-    - [CSS Animation](#css-animation)
-  - [Generators](#generators)
-  - [Code Optimization](#code-optimization)
-  - [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)
@@ -597,13 +540,17 @@
 - [LogRocket](https://blog.logrocket.com)
 - [React Blog](https://reactjs.org/blog)
 - [Scotch.io](https://scotch.io)
-- [Smashing Magazine](https://www.smashingmagazine.co
+- [Smashing Magazine](https://www.smashingmagazine.com)
+  <<<<<<< HEAD
 - [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