fix upstream merge