first commit
fix conflict readme