merge-fix.patch