fix merge conflicts #3234