confilict 2
add readme