update readme
Update README.md
update Readme
resolve conflict
changes in Entity core components