tsan: fix merge bug