Resolved readme conflicts