changed the equations
fixed conflicts