Update ThreeWayMerge.java