combine the 2 tables in one and show the rest of the columns