fix typos
add some material to the conclusion
remove conflicts