fix a botched conflict merge