Merged copyright and license addition