Fix any conflict