Updated tip about "--force" option in readme
fix conflict in README