fix Ts merge fucks