day 5
merge