Fork of Conflict2Diff