resolve conflicts for 5822

bigbluebutton-html5/imports/ui/components/actions-bar/desktop-share/component.jsx

@@ -56,6 +56,7 @@ const DesktopShare = ({
       circle
       size="lg"
       onClick={isVideoBroadcasting ? handleUnshareScreen : handleShareScreen}
+      id={isVideoBroadcasting ? 'unshare-screen-button' : 'share-screen-button'}
     />
     : null)
 );