SystemUI: Fix merge error

We need to observe whether there is a conflict, and resolve this conflict.