changing slot controller selector
tonal template parity
merge resolution