fixing syntax error from previous merge