1. integrated 3Diff in merge GUI 2.resolved some integration conflicts. 3. added fromMerge method to Diff3PrettyPrinter! Attentiongit statusgit status MCAddition and MCRemoval cause still problems, during 2way diffing