dev1 commit add
merge dev1 add
master add after dev1
dev1 update 2
fixed 2