diff --git a/front-end/src/components/CustomNode/NodeConfig.js b/front-end/src/components/CustomNode/NodeConfig.js
index 2245e3b..992d47f 100644
--- a/front-end/src/components/CustomNode/NodeConfig.js
+++ b/front-end/src/components/CustomNode/NodeConfig.js
@@ -135,23 +135,15 @@ function OptionInput(props) {
     if (props.type === "file") {
         inputComp = <FileUploadInput {...props} disabled={isFlow} />
     } else if (props.type === "string") {
-<<<<<<< HEAD
         inputComp = <SimpleInput {...props} type="text" disabled={isFlow} />
-=======
-        inputComp = <SimpleInput {...props} type="text" />
     } else if (props.type === "text") {
-        inputComp = <SimpleInput {...props} type="textarea"/>
->>>>>>> master
+        inputComp = <SimpleInput {...props} type="textarea" disabled={isFlow} />
     } else if (props.type === "int") {
         inputComp = <SimpleInput {...props} type="number" disabled={isFlow} />
     } else if (props.type === "boolean") {
-<<<<<<< HEAD
         inputComp = <BooleanInput {...props} disabled={isFlow} />
-=======
-        inputComp = <BooleanInput {...props} />
     } else if (props.type === "select") {
         inputComp = <SelectInput {...props} />
->>>>>>> master
     } else {
         return (<></>)
     }