trying to fix merge conflict #1742