fix conflict in topbar