remove conflict mark
fix comments in presentation.md