fix another git fail

Author: Half-Shot

src/shared-components/avatar/AvatarWithDetails/AvatarWithDetails.tsx

@@ -53,10 +53,6 @@ export function AvatarWithDetails<C extends React.ElementType = "div">({
 }: PropsWithChildren<AvatarWithDetailsProps<C>>): JSX.Element {
     const Component = as || "div";
 
-<<<<<<< HEAD
-    // Keep Mx_MediaBody to support the compatibility with existing timeline and the all the layout
-=======
->>>>>>> origin/develop
     return (
         <Component className={classNames(styles.avatarWithDetails, className)} {...props}>
             {avatar}