# Conflicts: # src/app/common/layout/v2-topbar/v2-topbar.component.html # src/app/common/layout/v2-topbar/v2-topbar.component.ts