fix bad merge conflict