GM stuff, part 4. Preparing for the session and resolving conflicts

   


v20240901