delete License.txt
branch dev test
And simple
& simple
conflict resolved
stash-dev
stash-merge-master