resolve confict after master rebasing

update index.html to use label-prop
update readme