conflict with upstream fix