rename row types
object_row cleanup
merge