diff --git a/app/src/tray.rs b/app/src/tray.rs
index ec8db58..6ef58cd 100644
--- a/app/src/tray.rs
+++ b/app/src/tray.rs
@@ -6,12 +6,9 @@ use tray_icon::{
     TrayIconBuilder, TrayIconEvent,
 };
 use winit::event_loop::{ControlFlow, EventLoopBuilder};
-<<<<<<< HEAD
-=======
 use image;
 
 #[cfg(target_os="windows")]
->>>>>>> sawixy/master
 use winit::platform::windows::EventLoopBuilderExtWindows;
 
 use crate::config;