ex2 1
ex2 2
merge done