Fix conflicts

Created by  itai.sharim  on September 27, 2022
62S5AKAC5VGAT4KZYRO4R6XIHO4CCD3RAUHQSW47VEGVEBNZGTGAC
Change contents