I don't think I changed anything
merge
clean up table