Fixing merging error.