Fixing an issue with merging.