fix statusbar merge error