PoC #1 Patch for failed marge