remove conflict readme and license