on branch dev
modified on dev branch
on bramnch master
conflicts done
dev
dev
with noff