merge upstream read me