mod a.txt add a line
merge with no ff