oups, fix bad merge conflict