almost done
merge