panel_colors: Fix mismerge