fixed a goofed merge