Ivorian rebels to rejoin cabinet