Small tweak to merge logic