fixing SGD conflict
Still fixing SGD conflicts