Test merge commit 3
Test merge commit resolved