Conflicts: include/PlayHandle.h src/core/FxMixer.cpp src/core/Mixer.cpp src/gui/FxMixerView.cpp src/tracks/InstrumentTrack.cpp
Conflicts: include/PlayHandle.h src/core/FxMixer.cpp src/core/Mixer.cpp src/gui/FxMixerView.cpp src/tracks/InstrumentTrack.cpp