Add Elias auto pulling
Resolve confilict