commit 2 merged