[#43224087] Updated merge conflicts