Rename README_conflict-20131009-132956.md to README.md