daily programmer 1 & 2
merge