removed FROM clause
fixed conflict