gave up on table
fixed conflict