Fixed diff (conflict moved to $a and $b)