Fix conflicts

src/plugins/reviewDB/components/ReviewComponent.tsx

@@ -29,7 +29,7 @@ export default LazyComponent(() => {
     // this is terrible, blame mantika
     const p = filters.byProps;
     const [
-        { cozyMessage, buttons },
+        { cozyMessage, buttons, message, groupStart },
         { container, isHeader },
         { avatar, clickable, username, messageContent, wrapper, cozy },
         { contents },
@@ -89,7 +89,6 @@ export default LazyComponent(() => {
                 <div className={contents} style={{ paddingLeft: "0px" }}>
                     <img
                         className={classes(avatar, clickable)}
-                        style={{ left: "8px" }}
                         onClick={openModal}
                         src={review.profile_photo || "/assets/1f0bfc0865d324c2587920a7d80c609b.png?size=128"}
                         style={{ left: "0px" }}

src/plugins/reviewDB/components/ReviewsView.tsx

@@ -78,16 +78,8 @@ export default function ReviewsView({ userId }: { userId: string; }) {
                     marginTop: "6px",
                     resize: "none",
                     marginBottom: "12px",
-
-                    padding: "12px",
-                    marginBottom: "12px",
-                    color: "var(--text-normal)",
-                    border: "1px solid var(--profile-message-input-border-color)",
-                    fontSize: "14px",
-                    borderRadius: "3px",
                 }}
             />
-        <div/>
+        </div>
     );
-
 }