branch test
AND Simple
simple
conflict fixed
fix  issue 001
merge bug fix 001
dev 01
master change