fixed a bad commit merge conflict