readme changes
merge conflicts