I forgot what I changed
merged
removing weird merge files
WAHHH