diff --git a/src/audio.cpp b/src/audio.cpp
index 4b19ec7..5438263 100644
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -69,10 +69,15 @@ void APU::initializeReadWriteHandlers()
 		return;
 	}
 
+<<<<<<< HEAD
 	mMap->setAudioReadHandler([this](Word address)
 	    { return this->readByte(address); });
 	mMap->setAudioWriteHandler([this](Word address, Byte value)
 	    { this->writeByte(address, value); });
+=======
+	mMap->setAudioReadHandler([this](Word address) { return this->readByte(address); });
+	mMap->setAudioWriteHandler([this](Word address, Byte value) { this->writeByte(address, value); });
+>>>>>>> bab3ce9 (Early return)
 }
 void APU::test()
 {