change
add branch
add fearture1
add master change
conflict
delete