update README
fix conflicts