fix syntax error from hasty merge