fixed a bad merge