clear stuff
merge