Fix #23930: Merging duplicated layers with little differences stalls JOSM
This is fixed by keeping the "last" conflict in the problem if statement body.