fixes merge conflicts for #1719