add self introduction.
fix conflict