Fix table after merge