license and logo
resolve merge conflict