working logistic regression code
fixed conflicts
fixed conflict issues