Fix conflicts

Author: arshadkazmi42

content/docs/components-and-props.md

@@ -68,10 +68,6 @@ function Welcome(props) {
   return <h1>नमस्ते, {props.name}</h1>;
 }
 
-<<<<<<< HEAD
-const element = <Welcome name="नेहा" />;
-=======
->>>>>>> 5f3a9756e00e256735a5f52df19b403d8fdd3a9d
 const root = ReactDOM.createRoot(document.getElementById('root'));
 const element = <Welcome name="Sara" />;
 root.render(element);