fixed a bad merge conflict