Tag 3-way merge