syntax error left over from merge