Fix merging error.