Fixing an error in merging