attempt to fix page

_config.yml

@@ -10,11 +10,7 @@
 ############################
 
 # Name of website
-<<<<<<< HEAD
-title: Home
-=======
-title: My website
->>>>>>> 2db1a164a8eb31f3077e3035c17d68e42f3e7557
+title: Cory Wilson
 
 # Your name to show in the footer
 author: a cgw joint
@@ -69,24 +65,13 @@ round-avatar: true
 # You can change the order that they show up on the page by changing the order here.
 # Uncomment the links you want to show and add your information to each one.
 social-network-links:
-<<<<<<< HEAD
   email: "[email protected]"
   #rss: false  # remove this line if you don't want to show an RSS link at the bottom
   #facebook: deanattali
   github: cg2wilson
   #twitter: daattali
   #patreon: DeanAttali
   #youtube: c/daattali
-=======
-  email: "[email protected]"
-  rss: true  # remove this line if you don't want to show an RSS link at the bottom
-  facebook: deanattali
-  github: daattali
-  twitter: daattali
-  patreon: DeanAttali
-  youtube: "@daattali"
-  whatsapp: 15551212
->>>>>>> 2db1a164a8eb31f3077e3035c17d68e42f3e7557
 #  medium: yourname
 #  reddit: yourname or r/yoursubreddit
 #  linkedin: daattali