Resolve merge conflicts with license and readme