Test merge commit 2