add zariz_get_merge_conflicts().