finished stuff
merge