resolved the conflicts

frontend/src/views/AngularWorkflow.jsx

@@ -7651,7 +7651,6 @@ const releaseToConnectLabel = "Release to Connect"
         }
       } else if (action.app_name === "Integration Framework") {
 		  const iconInfo = GetIconInfo(action)
-		  console.log("FOUND INTEGRATION: iconInfo: ", iconInfo)
 		  if (iconInfo !== undefined && iconInfo !== null) {
 		  	action.fillGradient = iconInfo.fillGradient
 		  	action.iconBackground = iconInfo.iconBackgroundColor
@@ -12602,7 +12601,6 @@ const releaseToConnectLabel = "Release to Connect"
 
 				//setWorkflow(workflow);
 			}
-			console.log("STARTNODE: ", startnode);
 		} else {
 			console.log("WORKFLOW: ", workflow);
 		}
@@ -14054,6 +14052,7 @@ const releaseToConnectLabel = "Release to Connect"
         setSelectedTrigger(trigger);
         setWorkflow(workflow);
         saveWorkflow(workflow);
+        setSelectedTrigger({})
    
       })
       .catch((error) => {
@@ -17014,6 +17013,7 @@ const releaseToConnectLabel = "Release to Connect"
           }
         }
 
+		/*
         if (( event.ctrlKey || event.metaKey ) && event.shiftKey) {
           console.log("Shift key pressed")
           if (!workflow.public && executionModalOpen) {
@@ -17025,6 +17025,7 @@ const releaseToConnectLabel = "Release to Connect"
             setExecutionModalView(0);
           }
         }
+		*/
       };
   
       document.addEventListener('keydown', handleKeyDown);