branch test
branch text1
AND simple
$ simple
coflict fixed