adaGrad
fix conflicts