add 6
merge test
delete one line and add one line