first commit
11
22
Update a
Update b
cat commit
Merge branch 'cat'
Dog commit
Resolve conflict