fix typo
add comment
update README
fix constraints warning
fix conflict