add b.txt to b-april
add a line to a.txt
change last line of a.txt
conflict fixed