resolve readme conflict