Fix merge conflicts caused by legacy Amplitude SDK