change for README
fix conflicts