update LICENSE and resolve merge conflict