change date in README
fix conflict