add module
update README
merge conflict in README