fix merge boo-boo
1 file changed