fixed conflicts

libs/remix-ui/debugger-ui/src/lib/vm-debugger/dropdown-panel.tsx

@@ -7,7 +7,7 @@ import './styles/dropdown-panel.css'
 
 export const DropdownPanel = (props: DropdownPanelProps) => {
   const [calldataObj, dispatch] = useReducer(reducer, initialState)
-  const { dropdownName, dropdownMessage, calldata, header, loading, extractFunc, formatSelfFunc, registerEvent, triggerEvent, loadMoreEvent, loadMoreCompletedEvent, headStyle, bodyStyle, hexHighlight } = props
+  const { dropdownName, className, dropdownMessage, calldata, header, loading, extractFunc, formatSelfFunc, registerEvent, triggerEvent, loadMoreEvent, loadMoreCompletedEvent, headStyle, bodyStyle, hexHighlight } = props
   const extractDataDefault: ExtractFunc = (item, parent?) => {
     const ret: ExtractData = {}
 
@@ -194,7 +194,7 @@ export const DropdownPanel = (props: DropdownPanelProps) => {
   const uniquePanelName = dropdownName.split(' ').join('')
 
   return (
-    <div className={props.className + " border rounded px-1 mt-1 bg-light"}>
+    <div className={className + " border rounded px-1 mt-1 bg-light"}>
       <div className="py-0 px-1 title" style={headStyle}>
         <div className={state.toggleDropdown ? 'icon fas fa-caret-down' : 'icon fas fa-caret-right'} onClick={handleToggle}></div>
         <div className="name" data-id={`dropdownPanel${uniquePanelName}`} onClick={handleToggle}>{dropdownName}</div><span className="nameDetail" onClick={handleToggle}>{header}</span>

libs/remix-ui/debugger-ui/src/lib/vm-debugger/step-detail.tsx

@@ -4,7 +4,7 @@ import DropdownPanel from './dropdown-panel' // eslint-disable-line
 export const StepDetail = ({ stepDetail, className = "" }) => {
   return (
     <div className={className} id='stepdetail' data-id='stepdetail'>
-      <DropdownPanel hexHighlight={false} dropdownName='Step details' calldata={stepDetail || {}} />
+      <DropdownPanel className={className} hexHighlight={false} dropdownName='Step details' calldata={stepDetail || {}} />
     </div>
   )
 }

libs/remix-ui/debugger-ui/src/lib/vm-debugger/vm-debugger.tsx

@@ -53,16 +53,16 @@ export const VmDebugger = ({ vmDebugger: { registerEvent }, currentBlock, curren
 
   return (
     <div id='vmdebugger' className="d-flex">
-      <div className='d-flex flex-column pr-2' style={{ flex: 1 }}>
+      <div className='d-flex flex-column px-2 pr-2' style={{ flex: 1 }}>
         <CallstackPanel className="pb-1" calldata={callStackPanel} />
         <StackPanel className="pb-1" calldata={stackPanel} />
         <MemoryPanel className="pb-1" calldata={memoryPanel} />
         <StoragePanel className="pb-1" calldata={storagePanel.calldata} header={storagePanel.header} />
+        <ReturnValuesPanel className="pb-1" dropdownName='Return Value' calldata={returnValuesPanel || {}} />
       </div>
-      <div className='d-flex flex-column pl-2' style={{ flex: 1 }}>
+      <div className='d-flex flex-column px-2 pl-2' style={{ flex: 1 }}>
         <CalldataPanel className="pb-1" calldata={calldataPanel} />
         <GlobalVariables className="pb-1" block={currentBlock} receipt={currentReceipt} tx={currentTransaction} />
-        <ReturnValuesPanel className="pb-1" dropdownName='Return Value' calldata={returnValuesPanel || {}} />
         <FullStoragesChangesPanel className="pb-1" calldata={fullStoragesChangesPanel} />
       </div>
     </div>