Copyright and License
Fixed conflicts after megre