added dev and staging to the list of portals
removed conflicts and added two portals to the list