Account menu is duplicated due to merge errors