Checking if we need a weighted or non-weighted diff and doing it for comparison
fixing conflict