fix forgotten conflict

Created by  itai.sharim  on October 1, 2022
AU3DVH4U7MBRJJB7MSIMKAJWK3FU24JHPFYCWXJRRZV5D4GQJJ3AC
Change contents