[#79227934] Resolve conflicts
Resolve conflicts