add at branch
ADD simple
& simple
and simple
top modify
top 2 modify
bottom modify
Merge branch 'dev1'
dev1 commit
conflict fixed