finish stuff
merge