Osaka talk
README conflict