title: github revert commit seems to have destroyed my project
body: <p>I'm new to React. Basically I created a bug I couldn't resolve, so I reverted to an old commit. Now, instead of reverting like normal, its changed my entire app. for example, one of the components now looks like this with <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;HEAD</code> everywhere.<br />
  I can't make any changes, I can't run the app and it wont compile. Please help.</p>
  <p>EDIT: please note, I used the desktop git control app, not terminal. I don't know if this matters.</p>
  <pre><code>import React from 'react';
  import './Welcome.css'
  import Filteritem from '../FilterItem/FilterItem';
  import recipes from '../data/recipes.json'
  
  
  const Nrec = () =&gt; {
      let newRecipe = recipes.filter(recipe =&gt; {
          return recipe.id === (recipes.length) 
      }) 
      console.log(newRecipe[0])
      return (
          &lt;div className=&quot;welcome__new-description-new-rec container-fluid&quot;&gt;
                  &lt;div className=&quot; welcome__new-menu-box-outer&quot;&gt;
                          &lt;div className=&quot;welcome__new-menu-box-inner&quot;&gt;
                              &lt;img src={newRecipe[0].image} alt=&quot;mains&quot; className=&quot;welcome__new-menu-box-img&quot;/&gt;
                              &lt;div className=&quot;welcome__new-menu-name-wrap&quot;&gt;
                                  &lt;h3 className=&quot;welcome__new-menu-box-img-text2 font&quot;&gt;Newest Recipe:&lt;/h3&gt;
                                  &lt;h3 className=&quot;welcome__new-menu-box-img-text font&quot;&gt;{newRecipe[0].name}&lt;/h3&gt;
                              &lt;/div&gt;
                          &lt;/div&gt;
                  &lt;/div&gt;
              &lt;/div&gt;
        );
      }
  
  const Welcome = () =&gt; {
  
      const filters = [
          {
              id: 1,
              name : &quot;Mains&quot;,
              image: &quot;https://images.pexels.com/photos/2116094/pexels-photo-2116094.jpeg?auto=compress&amp;cs=tinysrgb&amp;dpr=1&amp;w=500&quot;,
              filter: &quot;main&quot;
          },
          {
              id: 2,
              name : &quot;Sides&quot;,
              image: &quot;https://images.pexels.com/photos/262978/pexels-photo-262978.jpeg?auto=compress&amp;cs=tinysrgb&amp;dpr=1&amp;w=500&quot;,
              filter: &quot;side&quot;
          },
          {
              id: 3,
              name: &quot;Desserts&quot;,
              image: &quot;https://images.pexels.com/photos/45202/brownie-dessert-cake-sweet-45202.jpeg?auto=compress&amp;cs=tinysrgb&amp;dpr=1&amp;w=500&quot;,
              filter: &quot;dessert&quot;
          },
          {
              id: 4,
              name: &quot;Starters&quot;,
              image: &quot;https://images.pexels.com/photos/4173178/pexels-photo-4173178.jpeg?auto=compress&amp;cs=tinysrgb&amp;dpr=1&amp;w=500&quot;,
              filter: &quot;starter&quot;
          },
          {
              id: 5,
              name: &quot;Cakes&quot;,
              image : &quot;https://images.pexels.com/photos/1120970/pexels-photo-1120970.jpeg?auto=compress&amp;cs=tinysrgb&amp;dpr=1&amp;w=500&quot;,
              filter: &quot;cake&quot;
          }]
      
      return ( 
          &lt;div className=&quot;welcome&quot;&gt;
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
              &lt;div className=&quot;padder&quot;&gt;&lt;/div&gt;
              &lt;div className=&quot;container-fluid text-left welcome__title-box&quot;&gt;
                  &lt;h2 className=&quot;welcome__title font&quot;&gt;Welcome.&lt;/h2&gt;
                  &lt;p className=&quot;welcome__description font&quot;&gt; Select a menu below&lt;/p&gt;
  =======
              &lt;div className=&quot;container-fluid text-left welcome__title-box pl-0&quot;&gt;
                  &lt;h2 className=&quot;welcome__title font mt-2&quot;&gt;Welcome.&lt;/h2&gt;
                  &lt;p className=&quot;welcome__description&quot;&gt; Please select a menu below&lt;/p&gt;
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; parent of 745e6ca4... update
  =======
              &lt;div className=&quot;container-fluid text-left welcome__title-box pl-0&quot;&gt;
                  &lt;h2 className=&quot;welcome__title font mt-2&quot;&gt;Welcome.&lt;/h2&gt;
                  &lt;p className=&quot;welcome__description&quot;&gt; Please select a menu below&lt;/p&gt;
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; parent of 745e6ca4... update
  =======
              &lt;div className=&quot;container-fluid text-left welcome__title-box pl-0&quot;&gt;
                  &lt;h2 className=&quot;welcome__title font mt-2&quot;&gt;Welcome.&lt;/h2&gt;
                  &lt;p className=&quot;welcome__description&quot;&gt; Please select a menu below&lt;/p&gt;
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; parent of 745e6ca4... update
              &lt;/div&gt;
              &lt;div className=&quot;welcome__menu-box&quot;&gt;
                  {filters.map((filter) =&gt; &lt;Filteritem key={filter.id} filter={filter} /&gt;)}
              &lt;/div&gt;
              &lt;div className=&quot;padder&quot;&gt;&lt;/div&gt;
              &lt;div className=&quot;d-flex&quot;&gt;
              &lt;div className=&quot;welcome__new-rec&quot;&gt;
                  {Nrec()}
              &lt;/div&gt;
              &lt;div className=&quot;container-fluid welcome__title-box-bottom mt-5 pr-0&quot;&gt;
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
                  &lt;h3 className=&quot;welcome__description-bottom-header font&quot;&gt;All recipes&lt;/h3&gt;
                  &lt;p className=&quot;welcome__description-bottom font&quot;&gt;are sourced by Grandma from all over the net, editted and perfected by her expert touch.&lt;/p&gt;
              &lt;/div&gt;
  =======
                  &lt;p className=&quot;welcome__description-bottom mb-0&quot;&gt;All recipes are sourced by Grandma from all over the net, editted and perfected by her expert touch.&lt;/p&gt;
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; parent of 745e6ca4... update
  =======
                  &lt;p className=&quot;welcome__description-bottom mb-0&quot;&gt;All recipes are sourced by Grandma from all over the net, editted and perfected by her expert touch.&lt;/p&gt;
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; parent of 745e6ca4... update
  =======
                  &lt;p className=&quot;welcome__description-bottom mb-0&quot;&gt;All recipes are sourced by Grandma from all over the net, editted and perfected by her expert touch.&lt;/p&gt;
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; parent of 745e6ca4... update
              &lt;/div&gt;
              
              
          &lt;/div&gt;
       );
  }
   
  export default Welcome;
  </code></pre>