Resolve readme conflicts.