update 2.2.md
resolve conflicts in 2.2.md; add 2.3.md