[set] Fix merge logic
1 file changed