apply new patches to before the dubious applied/reverted merge