fixed conflict
fixed conflict

PC-ai/CWStatusBarNotification,jonesgithub/CWStatusBarNotification,apascual/CWStatusBarNotification,PorterHoskins/CWStatusBarNotification,cezarywojcik/CWStatusBarNotification,gshaviv/CWStatusBarNotification,tanweirush/CWStatusBarNotification,chao95957/CWStatusBarNotification