More testmerge fixes

tgui/packages/tgui/interfaces/AirlockElectronics.js

@@ -34,14 +34,14 @@ export const AirlockElectronics = (props, context) => {
                 })} />
               <Button
                 icon={unres_direction & 2 ? 'check-square-o' : 'square-o'}
-                content="East"
+                content="South"
                 selected={unres_direction & 2}
                 onClick={() => act('direc_set', {
                   unres_direction: '2',
                 })} />
               <Button
                 icon={unres_direction & 4 ? 'check-square-o' : 'square-o'}
-                content="South"
+                content="East"
                 selected={unres_direction & 4}
                 onClick={() => act('direc_set', {
                   unres_direction: '4',

tgui/packages/tgui/interfaces/TelecommsMonitor.js

@@ -177,7 +177,7 @@ export const TelecommsMonitor = (props, context) => {
                         .find(channel => channel.freq === thing);
                       return (
                         (valid) ? (
-                          <Box as="span" style={`color: ${valid.color}`}>
+                          <Box as="span" color={valid.color}>
                             {`[${thing}] (${valid.name}) `}
                           </Box>
                         ) : (

tgui/packages/tgui/interfaces/TelecommsPDALog.js

@@ -268,7 +268,7 @@ export const TeleLogs = (props, context) => {
         icon="sync"
         onClick={() => act('refresh')}
       />
-      <Button
+      <Button.Confirm
         content="Delete All Logs"
         icon="trash"
         disabled={!log_to_use || !(log_to_use && log_to_use.length)}