After merge 3
After merge 3 and 1/2
after merge #5