added license
merged conflicts