Fix latest merges