The mate-panel and gnome-panel are no longer in conflict, so remove mate-panel from CONFLICTS