diff --git a/platform.txt b/platform.txt
index 4ad6fd1c..04b490a7 100644
--- a/platform.txt
+++ b/platform.txt
@@ -6,11 +6,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=ATtiny Classic
-<<<<<<< HEAD
 version=1.0.4
-=======
-version=1.0.3
->>>>>>> origin/boardmanager
 
 # AVR compile variables
 # ---------------------