not sure what i did
stil not sure merge fixed