done week4
merge