diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp
index ff3926423..4cb224ed6 100644
--- a/src/engine/playback.cpp
+++ b/src/engine/playback.cpp
@@ -263,348 +263,8 @@ int DivEngine::dispatchCmd(DivCommand c) {
 }
 
 bool DivEngine::perSystemEffect(int ch, unsigned char effect, unsigned char effectVal) {
-<<<<<<< HEAD
-  switch (sysOfChan[ch]) {
-    case DIV_SYSTEM_YM2612:
-    case DIV_SYSTEM_YM2612_EXT:
-      switch (effect) {
-        case 0x17: // DAC enable
-          dispatchCmd(DivCommand(DIV_CMD_SAMPLE_MODE,ch,(effectVal>0)));
-          break;
-        case 0x20: // SN noise mode
-          dispatchCmd(DivCommand(DIV_CMD_STD_NOISE_MODE,ch,effectVal));
-          break;
-        case 0x30: // toggle hard-reset
-          dispatchCmd(DivCommand(DIV_CMD_FM_HARD_RESET,ch,effectVal));
-          break;
-        default:
-          return false;
-      }
-      break;
-    case DIV_SYSTEM_YM2151:
-    case DIV_SYSTEM_YM2610:
-    case DIV_SYSTEM_YM2610_EXT:
-    case DIV_SYSTEM_YM2610B:
-    case DIV_SYSTEM_YM2610B_EXT:
-    case DIV_SYSTEM_OPZ:
-      switch (effect) {
-        case 0x30: // toggle hard-reset
-          dispatchCmd(DivCommand(DIV_CMD_FM_HARD_RESET,ch,effectVal));
-          break;
-        default:
-          return false;
-      }
-      break;
-    case DIV_SYSTEM_SMS:
-      switch (effect) {
-        case 0x20: // SN noise mode
-          dispatchCmd(DivCommand(DIV_CMD_STD_NOISE_MODE,ch,effectVal));
-          break;
-        default:
-          return false;
-      }
-      break;
-    case DIV_SYSTEM_GB:
-      switch (effect) {
-        case 0x10: // select waveform
-          dispatchCmd(DivCommand(DIV_CMD_WAVE,ch,effectVal));
-          break;
-        case 0x11: case 0x12: // duty or noise mode
-          dispatchCmd(DivCommand(DIV_CMD_STD_NOISE_MODE,ch,effectVal));
-          break;
-        case 0x13: // sweep params
-          dispatchCmd(DivCommand(DIV_CMD_GB_SWEEP_TIME,ch,effectVal));
-          break;
-        case 0x14: // sweep direction
-          dispatchCmd(DivCommand(DIV_CMD_GB_SWEEP_DIR,ch,effectVal));
-          break;
-        default:
-          return false;
-      }
-      break;
-    case DIV_SYSTEM_PCE:
-      switch (effect) {
-        case 0x10: // select waveform
-          dispatchCmd(DivCommand(DIV_CMD_WAVE,ch,effectVal));
-          break;
-        case 0x11: // noise mode
-          dispatchCmd(DivCommand(DIV_CMD_STD_NOISE_MODE,ch,effectVal));
-          break;
-        case 0x12: // LFO mode
-          dispatchCmd(DivCommand(DIV_CMD_PCE_LFO_MODE,ch,effectVal));
-          break;
-        case 0x13: // LFO speed
-          dispatchCmd(DivCommand(DIV_CMD_PCE_LFO_SPEED,ch,effectVal));
-          break;
-        case 0x17: // PCM enable
-          dispatchCmd(DivCommand(DIV_CMD_SAMPLE_MODE,ch,(effectVal>0)));
-          break;
-        default:
-          return false;
-      }
-      break;
-    case DIV_SYSTEM_NES:
-    case DIV_SYSTEM_MMC5:
-      switch (effect) {
-        case 0x11: // DMC write
-          dispatchCmd(DivCommand(DIV_CMD_NES_DMC,ch,effectVal));
-          break;
-        case 0x12: // duty or noise mode
-          dispatchCmd(DivCommand(DIV_CMD_STD_NOISE_MODE,ch,effectVal));
-          break;
-        case 0x13: // sweep up
-          dispatchCmd(DivCommand(DIV_CMD_NES_SWEEP,ch,0,effectVal));
-          break;
-        case 0x14: // sweep down
-          dispatchCmd(DivCommand(DIV_CMD_NES_SWEEP,ch,1,effectVal));
-          break;
-        case 0x18: // DPCM mode
-          dispatchCmd(DivCommand(DIV_CMD_SAMPLE_MODE,ch,effectVal));
-          break;
-        default:
-          return false;
-      }
-      break;
-    case DIV_SYSTEM_FDS:
-      switch (effect) {
-        case 0x10: // select waveform
-          dispatchCmd(DivCommand(DIV_CMD_WAVE,ch,effectVal));
-          break;
-        case 0x11: // modulation depth
-          dispatchCmd(DivCommand(DIV_CMD_FDS_MOD_DEPTH,ch,effectVal));
-          break;
-        case 0x12: // modulation enable/high
-          dispatchCmd(DivCommand(DIV_CMD_FDS_MOD_HIGH,ch,effectVal));
-          break;
-        case 0x13: // modulation low
-          dispatchCmd(DivCommand(DIV_CMD_FDS_MOD_LOW,ch,effectVal));
-          break;
-        case 0x14: // modulation pos
-          dispatchCmd(DivCommand(DIV_CMD_FDS_MOD_POS,ch,effectVal));
-          break;
-        case 0x15: // modulation wave
-          dispatchCmd(DivCommand(DIV_CMD_FDS_MOD_WAVE,ch,effectVal));
-          break;
-        default:
-          return false;
-      }
-      break;
-    case DIV_SYSTEM_OPLL_DRUMS:
-    case DIV_SYSTEM_OPL_DRUMS:
-    case DIV_SYSTEM_OPL2_DRUMS:
-    case DIV_SYSTEM_OPL3_DRUMS:
-      switch (effect) {
-        case 0x18: // drum mode toggle
-          dispatchCmd(DivCommand(DIV_CMD_FM_EXTCH,ch,effectVal));
-          break;
-        case 0x30: // toggle hard-reset
-          dispatchCmd(DivCommand(DIV_CMD_FM_HARD_RESET,ch,effectVal));
-          break;
-        default:
-          return false;
-      }
-      break;
-    case DIV_SYSTEM_OPLL:
-    case DIV_SYSTEM_VRC7:
-    case DIV_SYSTEM_OPL:
-    case DIV_SYSTEM_OPL2:
-    case DIV_SYSTEM_OPL3:
-      switch (effect) {
-        case 0x30: // toggle hard-reset
-          dispatchCmd(DivCommand(DIV_CMD_FM_HARD_RESET,ch,effectVal));
-          break;
-        default:
-          return false;
-      }
-      break;
-    case DIV_SYSTEM_N163:
-      switch (effect) {
-        case 0x10: // select instrument waveform
-          dispatchCmd(DivCommand(DIV_CMD_WAVE,ch,effectVal));
-          break;
-        case 0x11: // select instrument waveform position in RAM
-          dispatchCmd(DivCommand(DIV_CMD_N163_WAVE_POSITION,ch,effectVal));
-          break;
-        case 0x12: // select instrument waveform length in RAM
-          dispatchCmd(DivCommand(DIV_CMD_N163_WAVE_LENGTH,ch,effectVal));
-          break;
-        case 0x13: // change instrument waveform update mode
-          dispatchCmd(DivCommand(DIV_CMD_N163_WAVE_MODE,ch,effectVal));
-          break;
-        case 0x14: // select waveform for load to RAM
-          dispatchCmd(DivCommand(DIV_CMD_N163_WAVE_LOAD,ch,effectVal));
-          break;
-        case 0x15: // select waveform position for load to RAM
-          dispatchCmd(DivCommand(DIV_CMD_N163_WAVE_LOADPOS,ch,effectVal));
-          break;
-        case 0x16: // select waveform length for load to RAM
-          dispatchCmd(DivCommand(DIV_CMD_N163_WAVE_LOADLEN,ch,effectVal));
-          break;
-        case 0x17: // change waveform load mode
-          dispatchCmd(DivCommand(DIV_CMD_N163_WAVE_LOADMODE,ch,effectVal));
-          break;
-        case 0x18: // change channel limits
-          dispatchCmd(DivCommand(DIV_CMD_N163_CHANNEL_LIMIT,ch,effectVal));
-          break;
-        case 0x20: // (global) select waveform for load to RAM
-          dispatchCmd(DivCommand(DIV_CMD_N163_GLOBAL_WAVE_LOAD,ch,effectVal));
-          break;
-        case 0x21: // (global) select waveform position for load to RAM
-          dispatchCmd(DivCommand(DIV_CMD_N163_GLOBAL_WAVE_LOADPOS,ch,effectVal));
-          break;
-        case 0x22: // (global) select waveform length for load to RAM
-          dispatchCmd(DivCommand(DIV_CMD_N163_GLOBAL_WAVE_LOADLEN,ch,effectVal));
-          break;
-        case 0x23: // (global) change waveform load mode
-          dispatchCmd(DivCommand(DIV_CMD_N163_GLOBAL_WAVE_LOADMODE,ch,effectVal));
-          break;
-        default:
-          return false;
-      }
-      break;
-    case DIV_SYSTEM_QSOUND:
-      switch (effect) {
-        case 0x10: // echo feedback
-          dispatchCmd(DivCommand(DIV_CMD_QSOUND_ECHO_FEEDBACK,ch,effectVal));
-          break;
-        case 0x11: // echo level
-          dispatchCmd(DivCommand(DIV_CMD_QSOUND_ECHO_LEVEL,ch,effectVal));
-          break;
-        case 0x12: // surround
-          dispatchCmd(DivCommand(DIV_CMD_QSOUND_SURROUND,ch,effectVal));
-          break;
-        default:
-          if ((effect&0xf0)==0x30) {
-            dispatchCmd(DivCommand(DIV_CMD_QSOUND_ECHO_DELAY,ch,((effect & 0x0f) << 8) | effectVal));
-          } else {
-            return false;
-          }
-          break;
-      }
-      break;
-    case DIV_SYSTEM_X1_010:
-      switch (effect) {
-        case 0x10: // select waveform
-          dispatchCmd(DivCommand(DIV_CMD_WAVE,ch,effectVal));
-          break;
-        case 0x11: // select envelope shape
-          dispatchCmd(DivCommand(DIV_CMD_X1_010_ENVELOPE_SHAPE,ch,effectVal));
-          break;
-        case 0x17: // PCM enable
-          dispatchCmd(DivCommand(DIV_CMD_SAMPLE_MODE,ch,(effectVal>0)));
-          break;
-        default:
-          return false;
-      }
-      break;
-    case DIV_SYSTEM_SWAN:
-      switch (effect) {
-        case 0x10: // select waveform
-          dispatchCmd(DivCommand(DIV_CMD_WAVE,ch,effectVal));
-          break;
-        case 0x11: // noise mode
-          dispatchCmd(DivCommand(DIV_CMD_STD_NOISE_MODE,ch,effectVal));
-          break;
-        case 0x12: // sweep period
-          dispatchCmd(DivCommand(DIV_CMD_WS_SWEEP_TIME,ch,effectVal));
-          break;
-        case 0x13: // sweep amount
-          dispatchCmd(DivCommand(DIV_CMD_WS_SWEEP_AMOUNT,ch,effectVal));
-          break;
-        case 0x17: // PCM enable
-          dispatchCmd(DivCommand(DIV_CMD_SAMPLE_MODE,ch,(effectVal>0)));
-          break;
-        default:
-          return false;
-      }
-      break;
-    case DIV_SYSTEM_VERA:
-      switch (effect) {
-        case 0x20: // select waveform
-          dispatchCmd(DivCommand(DIV_CMD_WAVE,ch,effectVal));
-          break;
-        case 0x22: // duty
-          dispatchCmd(DivCommand(DIV_CMD_STD_NOISE_MODE,ch,effectVal));
-          break;
-        default:
-          return false;
-      }
-      break;
-    case DIV_SYSTEM_BUBSYS_WSG:
-    case DIV_SYSTEM_PET:
-    case DIV_SYSTEM_VIC20:
-      switch (effect) {
-        case 0x10: // select waveform
-          dispatchCmd(DivCommand(DIV_CMD_WAVE,ch,effectVal));
-          break;
-        default:
-          return false;
-      }
-      break;
-    case DIV_SYSTEM_VRC6:
-      switch (effect) {
-        case 0x12: // duty or noise mode
-          dispatchCmd(DivCommand(DIV_CMD_STD_NOISE_MODE,ch,effectVal));
-          break;
-        case 0x17: // PCM enable
-          dispatchCmd(DivCommand(DIV_CMD_SAMPLE_MODE,ch,(effectVal>0)));
-          break;
-        default:
-          return false;
-      }
-      break;
-    case DIV_SYSTEM_ES5506:
-      switch (effect) {
-        case 0x10: // select waveform
-          dispatchCmd(DivCommand(DIV_CMD_WAVE,ch,effectVal));
-          break;
-        case 0x11: // filter mode
-          dispatchCmd(DivCommand(DIV_CMD_ES5506_FILTER_MODE,ch,effectVal&3));
-          break;
-        case 0x20:
-        case 0x21: // envelope ECOUNT
-          dispatchCmd(DivCommand(DIV_CMD_ES5506_ENVELOPE_COUNT,ch,((effect&0x01)<<8)|effectVal));
-          break;
-        case 0x22: // envelope LVRAMP
-          dispatchCmd(DivCommand(DIV_CMD_ES5506_ENVELOPE_LVRAMP,ch,effectVal));
-          break;
-        case 0x23: // envelope RVRAMP
-          dispatchCmd(DivCommand(DIV_CMD_ES5506_ENVELOPE_RVRAMP,ch,effectVal));
-          break;
-        case 0x24:
-        case 0x25: // envelope K1RAMP
-          dispatchCmd(DivCommand(DIV_CMD_ES5506_ENVELOPE_K1RAMP,ch,effectVal,effect&0x01));
-          break;
-        case 0x26:
-        case 0x27: // envelope K2RAMP
-          dispatchCmd(DivCommand(DIV_CMD_ES5506_ENVELOPE_K2RAMP,ch,effectVal,effect&0x01));
-          break;
-        case 0x28: // filter K1 slide up
-        case 0x29: // filter K1 slide down
-          dispatchCmd(DivCommand(DIV_CMD_ES5506_FILTER_K1_SLIDE,ch,effectVal,effect&0x01));
-          break;
-        case 0x2a: // filter K2 slide up
-        case 0x2b: // filter K2 slide down
-          dispatchCmd(DivCommand(DIV_CMD_ES5506_FILTER_K2_SLIDE,ch,effectVal,effect&0x01));
-          break;
-        default:
-          if ((effect&0xf0)==0x30) {
-            dispatchCmd(DivCommand(DIV_CMD_ES5506_FILTER_K1,ch,((effect&0x0f)<<8)|effectVal));
-          } else if ((effect&0xf0)==0x40) {
-            dispatchCmd(DivCommand(DIV_CMD_ES5506_FILTER_K2,ch,((effect&0x0f)<<8)|effectVal));
-          } else {
-            return false;
-          }
-      }
-      break;
-    default:
-      return false;
-  }
-  return true;
-=======
   if (sysDefs[sysOfChan[ch]]==NULL) return false;
   return sysDefs[sysOfChan[ch]]->effectFunc(ch,effect,effectVal);
->>>>>>> 4c9b172b50a240efc37aec8bdd4a59972fbf10c4
 }
 
 bool DivEngine::perSystemPostEffect(int ch, unsigned char effect, unsigned char effectVal) {