remove conflict readme.md
merge latest master 1.1.1 and fix some compats
resolve conflict readme.md