conflict with upstream version