it doesn't look like you moved addChild in that pr did you? so it shouldn't conflict