add more lines
merge conflict
Update LICENSE
resolve conflicts