Merge copilot/sub-pr-175: resolve conflicts, move hybrid meeting info to margin note

- Merge PR #176 from copilot/sub-pr-175
- Resolve conflict in lab meetings section
- Move hybrid meeting info to margin note for consistency with document style
- Remove duplicate hybrid meeting info from intro paragraph
- Recompile PDF

Author: claude

lab_manual.pdf

@@ -732,19 +732,31 @@ \subsection{Authorship guidelines}
 \noindent Effective lab communication requires forums for communicating.  We use \href{http://www.slack.com}{Slack} to
 facilitate remote communications, and encourage
 in-person interactions as often as possible---ideally several times a
-week for group projects.  All of our meetings are hybrid: you can attend in person in Moore 416 or via Zoom. The Zoom link is posted in the \texttt{\#general} Slack channel at the start of each term and is used for all lab Zoom meetings unless otherwise noted. We have the following regularly scheduled
+week for group projects.  We have the following regularly scheduled
 meetings:
 
+\marginnote{\texttt{NOTE:} All lab meetings are hybrid: in person in
+  Moore 416 or on Zoom. A Zoom link is provided in the \texttt{\#general}
+  Slack channel at the start of each term, to be used for all lab Zoom
+  meetings unless otherwise noted.}
+
 \begin{itemize}
-  \item \textbf{Lab meetings.} We hold weekly lab meetings. During the first week of each term,
-we schedule meeting times via a When2Meet poll shared on Slack. Once finalized,
-the schedule is posted and pinned to the \texttt{\#general} channel.  If you are an active
-lab member, you are expected to attend our lab meetings unless you
-let \director~know that you have a conflict (e.g., a course that meets
-at the same time, another commitment that comes up, etc.). Prioritizing lab meeting attendance helps build
-and maintain a lab culture of collaboration and ongoing participation.
-
-During lab meetings, we typically focus on things that project teams want input on beyond their immediate group. We also use lab meetings to discuss logistics, give feedback on upcoming talks or poster presentations, and share project updates that might be of interest beyond one project team. Generally we spend most of the time going around the room and having each person give a brief informal update about something they are working on, planning to work on, or thinking about.
+  \item \textbf{Lab meetings.} We hold weekly lab meetings.
+During the first week of each term, we schedule meeting times via a When2Meet poll
+shared on Slack. Once finalized, the schedule is posted and pinned to the
+\texttt{\#general} channel. If you are an active lab member, you are expected to
+attend our lab meetings unless you let \director~know that you have a conflict
+(e.g., a course that meets at the same time, another commitment that comes up,
+etc.). Prioritizing lab meeting attendance helps build and maintain a lab culture
+of collaboration and ongoing participation.
+
+During lab meetings we typically focus on things that project teams want input
+on beyond their immediate group. We also use lab meetings to discuss logistics,
+give feedback on upcoming talks or poster presentations, and/or share project
+updates that might be of interest beyond one project team. Generally we spend
+most of the time going around the room and having each person give a brief
+informal update about something they are working on, planning to work on, or
+thinking about.