Solve conflict
HF-DAgger table