Fixing Merge Crud