Fix missed merging issues.