Fix syntax error from merge