Fixing an error with the merge.