larger faders
merge conflicts