fix of JT merge