first commit
change
end change in master
marged