second branch commit 1
conflict resolved