add add_2 and modified add_1
add add_2
solve conflict