resolved readme conflicts