JLD 3-way merge