diff --git a/src/pages/VisProgPage/visualProgrammingUI/nodes/NormNode.default.ts b/src/pages/VisProgPage/visualProgrammingUI/nodes/NormNode.default.ts
index 8df25cc..185d232 100644
--- a/src/pages/VisProgPage/visualProgrammingUI/nodes/NormNode.default.ts
+++ b/src/pages/VisProgPage/visualProgrammingUI/nodes/NormNode.default.ts
@@ -6,7 +6,7 @@ import type { NormNodeData } from "./NormNode";
 export const NormNodeDefaults: NormNodeData = {
   label: "Norm Node",
   droppable: true,
-  conditions: [],
+  condition: undefined,
   norm: "",
   hasReduce: true,
   critical: false,
diff --git a/src/pages/VisProgPage/visualProgrammingUI/nodes/NormNode.tsx b/src/pages/VisProgPage/visualProgrammingUI/nodes/NormNode.tsx
index 32922c7..ac0a815 100644
--- a/src/pages/VisProgPage/visualProgrammingUI/nodes/NormNode.tsx
+++ b/src/pages/VisProgPage/visualProgrammingUI/nodes/NormNode.tsx
@@ -20,10 +20,7 @@ import { BasicBeliefReduce } from './BasicBeliefNode';
 export type NormNodeData = {
   label: string;
   droppable: boolean;
-<<<<<<< HEAD
   condition?: string; // id of this node's belief.
-=======
->>>>>>> demo
   norm: string;
   hasReduce: boolean;
   critical: boolean;
@@ -73,15 +70,14 @@ export default function NormNode(props: NodeProps<NormNode>) {
         />
       </div>
 
-<<<<<<< HEAD
+
       {data.condition && (<div className={"flex-row gap-md align-center"} data-testid="norm-condition-information">
         <label htmlFor={checkbox_id}>Condition/ Belief attached.</label>
       </div>)}
-=======
+
   
       <Handle type="source" position={Position.Right} id="norms"/>
       <Handle type="target" position={Position.Bottom} id="norms"/>
->>>>>>> demo
     </div>
   </>;
 };
@@ -95,8 +91,6 @@ export default function NormNode(props: NodeProps<NormNode>) {
 export function NormReduce(node: Node, nodes: Node[]) {
   const data = node.data as NormNodeData;
 
-<<<<<<< HEAD
-=======
   // conditions nodes - make sure to check for empty arrays
   const result: Record<string, unknown> = {
     id: node.id,
@@ -105,7 +99,6 @@ export function NormReduce(node: Node, nodes: Node[]) {
     critical: data.critical,
   };
 
-<<<<<<< HEAD
   if (data.condition) {
     const reducer = BasicBeliefReduce; // TODO: also add inferred.
     const conditionNode = nodes.find((node) => node.id === data.condition);
diff --git a/src/pages/VisProgPage/visualProgrammingUI/nodes/PhaseNode.tsx b/src/pages/VisProgPage/visualProgrammingUI/nodes/PhaseNode.tsx
index 51cf6e7..441e84f 100644
--- a/src/pages/VisProgPage/visualProgrammingUI/nodes/PhaseNode.tsx
+++ b/src/pages/VisProgPage/visualProgrammingUI/nodes/PhaseNode.tsx
@@ -101,7 +101,7 @@ export function PhaseReduce(node: Node, nodes: Node[]) {
 
     // Build the result object
     const result: Record<string, unknown> = {
-        id: thisnode.id,
+        id: thisNode.id,
         name: data.label,
     };