add 2 new features.
commit 3
resolve conflicts