fix to controls_if_elseif maybe be aborted during merge
fix to controls_if_elseif maybe be aborted during merge

xbed/Mixly_Arduino,xbed/Mixly_Arduino,xbed/Mixly_Arduino,xbed/Mixly_Arduino,xbed/Mixly_Arduino,xbed/Mixly_Arduino,xbed/Mixly_Arduino,xbed/Mixly_Arduino