diff --git a/src/commands/init.ts b/src/commands/init.ts
index ec08fb5..6c630df 100644
--- a/src/commands/init.ts
+++ b/src/commands/init.ts
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-import { greenBright, redBright, underline } from 'colorette';
-=======
 import { green, greenBright, redBright } from 'colorette';
->>>>>>> 7dc71c0 (feat: fallback way of downloading templates!)
 import { execa } from 'execa';
 import { findUp } from 'find-up';
 import ora from 'ora';