well, i don't know how to merge it in the OSX,
but my impression is during the installation, when it ask you which partition to install, you can, at that stage, use the tool provided from the menu bar, merge the partitions.
I know some tools under windows or linux, but not OSX.