diff --git a/vite/src/pipedal/VuMeter.tsx b/vite/src/pipedal/VuMeter.tsx
index 80bdec8..e30c126 100644
--- a/vite/src/pipedal/VuMeter.tsx
+++ b/vite/src/pipedal/VuMeter.tsx
@@ -200,8 +200,8 @@ interface VuMeterProps extends WithStyles<typeof styles> {
     instanceId: number;
     display: "input" | "output";
     theme: Theme;
-<<<<<<< HEAD
     height?: number;
+
     displayText?: boolean;
 }