table and typos
merge conflict