diff --git a/IRremote.cpp b/IRremote.cpp
index f4c6be6..0d2ac11 100644
--- a/IRremote.cpp
+++ b/IRremote.cpp
@@ -631,7 +631,6 @@ long IRrecv::decodeSony(decode_results *results) {
   return DECODED;
 }
 
-<<<<<<< HEAD
 long IRrecv::decodeWhynter(decode_results *results) {
   long data = 0;
   
diff --git a/IRremote.h b/IRremote.h
index a149bdd..f4c0bd6 100644
--- a/IRremote.h
+++ b/IRremote.h
@@ -55,7 +55,6 @@ public:
 #define WHYNTER 13
 #define Sharp 14
 #define AIWA_RC_T501 15
->>>>>>> crash7-master
 #define UNKNOWN -1
 
 // Decoded value for NEC when a repeat code is received
diff --git a/changelog.md b/changelog.md
index 226acc2..c95806f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -5,3 +5,4 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.0.1] - 2015-03-08
 ### Added
 - Support for Sharp Decoding
+- Support for Aiwa Decoding