merge conflict
angular add for the second table