Correct 2.4.2p8 merge conflict