ex3 update
wrong merge
merge