had to get merge which broke things

i did it