fix readme conflicts