add copyright and licence
fixed merge conflict