not sure what i changed
fixed merge