New branch 2 commit
New branch 2 commit 2
merget conflict resolved