fixed merge conflict

Signed-off-by: Johnnie <>

authors/name_surname.md

@@ -1,13 +1,3 @@
-<<<<<<< HEAD
-Author: [Your Name]
-Title: [e.g., Software Engineer]
-Description: [Your brief bio here. Must be between 140 and 450 characters.]
-Company Name: [Your Company or Affiliation Name]
-Company Description: [Brief description of your company/affiliation, not more than 200 characters]
-Author Image: [URL or path to your .jpg image, minimum width 512px, portrait]
-Company Logo Dark: [URL or path to your company logo in .png format, min width 512px for dark background]
-Company Logo White: [URL or path to your company logo in .png format, min width 512px for light background]
-=======
 Author: [Your Name] Title: [e.g., Software Engineer] Description: [Your brief
 bio here. Must be between 140 and 450 characters.] Author Image: [URL or path to
 your .jpg image, minimum width 512px, portrait] Author LinkedIn: Author Twitter:
@@ -16,4 +6,3 @@ description of your company/affiliation, not more than 200 characters] Company
 Logo Dark: [URL or path to your company logo in .png format, min width 512px for
 dark background] Company Logo White: [URL or path to your company logo in .png
 format, min width 512px for light background]
->>>>>>> 3b409bd (fixed linting issues and changes some rules)