master add 1
dev add lisence
dev add 1
feature1 add
master add 2
conflict fixed