userBar
userBar & conflict fix