reverting changes
Revert "fixed readme conflict"

This reverts commit 2fa7cfe29ace6224218125d02e34fba647130b2e.