Fix merge conflict

packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte

@@ -18,14 +18,12 @@
   )
 
   function fetchQueryDefinition(query) {
-    const source = $datasources.list.find(
+    const source = $datasources.list.find(ds => ds._id === query.datasourceId)
-      ds => ds._id === query.datasourceId
+      .source
-    ).source
     return $integrations[source].query[query.queryVerb]
   }
 </script>
 
-
 <Label small>Datasource</Label>
 <Select thin secondary bind:value={parameters.datasourceId}>
   <option value="" />
@@ -44,37 +42,18 @@
       <option value={query._id}>{query.name}</option>
     {/each}
   </Select>
+{/if}
 
-  <Spacer medium />
+<Spacer medium />
-
-  {#if parameters.datasourceId}
-    <Label small>Query</Label>
-    <Select thin secondary bind:value={parameters.queryId}>
-      <option value="" />
-      {#each $backendUiStore.queries.filter(query => query.datasourceId === datasource._id) as query}
-        <option value={query._id}>{query.name}</option>
-      {/each}
-    </Select>
-  {/if}
-
-  <Spacer medium />
-
-  {#if query?.parameters?.length > 0}
-    <ParameterBuilder
-      bind:customParams={parameters.queryParams}
-      parameters={query.parameters}
-      bindings={bindableProperties} />
-    <IntegrationQueryEditor
-      height={200}
-      {query}
-      schema={fetchQueryDefinition(query)}
-      editable={false} />
-  {/if}
-</div>
 
-<style>
+{#if query?.parameters?.length > 0}
-  .root {
+  <ParameterBuilder
-    max-width: 800px;
+    bind:customParams={parameters.queryParams}
-    margin: 0 auto;
+    parameters={query.parameters}
-  }
+    bindings={bindableProperties} />
-</style>
+  <IntegrationQueryEditor
+    height={200}
+    {query}
+    schema={fetchQueryDefinition(query)}
+    editable={false} />
+{/if}