Transtore conflict fix is active