Updating and correcting README
Fixed conflict