Fixing up Merge