Resolving issues with upstream merge