br 3 commit 2
After merge with master
master commit #4
After merge commit
After merge 3
After merge 3 and 1/2