diff --git a/ui/packages/app/src/main.ts b/ui/packages/app/src/main.ts
index ca169d2aa6..146dcd991e 100644
--- a/ui/packages/app/src/main.ts
+++ b/ui/packages/app/src/main.ts
@@ -1,5 +1,5 @@
 import App from "./App.svelte";
-import Blocks from "./Blocks.svelte"
+import Blocks from "./Blocks.svelte";
 import Login from "./Login.svelte";
 import { fn } from "./api";
 
@@ -101,20 +101,12 @@ window.launchGradio = (config: Config, element_query: string) => {
 			new Blocks({
 				target: target,
 				props: config
-<<<<<<< HEAD
-			});	
-=======
 			});
->>>>>>> Blocks-Components
 		} else {
 			new App({
 				target: target,
 				props: config
-<<<<<<< HEAD
-			});	
-=======
 			});
->>>>>>> Blocks-Components
 		}
 	}
 };
diff --git a/ui/packages/upload/src/Upload.svelte b/ui/packages/upload/src/Upload.svelte
index 16047acb2c..fd95ada8db 100644
--- a/ui/packages/upload/src/Upload.svelte
+++ b/ui/packages/upload/src/Upload.svelte
@@ -8,6 +8,7 @@
 	export let include_file_metadata = true;
 	let hidden_upload: HTMLInputElement;
 	let dragging = false;
+	let file_count;
 
 	const dispatch = createEventDispatcher();