diff --git a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
index 5e162cd297a..3dd9e38ecb0 100644
--- a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
+++ b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
@@ -147,10 +147,5 @@
-<<<<<<< HEAD
-
-
-=======
->>>>>>> dev/lelian/notifyicon/proto