added fader
merge