3-way merge