init project
merge
update readme
resolve conflict
update readme