Fix conflicts in topbar and styles_2