Fixed a Merge Problem