link table name fix
conflict cleanup
Split the DB update scripts