fix ROW conflicts