fixed readme conflicts