master m1
merge conflicts
local stash & switch branch, commit
test branch new, delete, rename
delete file