S-48324 Fixed funky merge