fixed all confls FO REAL.
i think i fixed all the confls oh my god i hate dis shiet
some shit
change colors
changed hyperlink colors