merge more stuff