shit
test
working branch commit
master commit
merge commit
rm shit
Merge branch 'working'