fix merge conflicts #3307