Got rid of unused merge_diff tool