2-way merge