Changing partner for conflicting districts