fix third_party merge corruption