finalizing stuff
merge