dev branch commit
branch dev second commit
master commit
fix conflict
fixed commit
test conflict
second fix conflict