resolving confilct from merging with upstream