Add X in Line2
Y is added to Line5
Merge branch 'b1'
A added to Line 1
Add B in Line 1
conflict solved: B remains in eof line1
short cat is add to master
Stretched the shortcat
add shortcat to b2
add ears to shortcat