edit LICENSE
merged dev