merge stuff and all