Add README.md
add conflict mode
add master