Fix Merge Problem