add ruby hot run
resolve conflict