repo in readme
resolve readme conflict