try to create conflict from master branch
update readme file from master branch
update from temp