merge upstream / delete diles