merge upstream & update configs
clean