before table changes
historyboard working
merge fix