fixed the panel conflict