rm for merge upstream