Merge from both TPS