idk
conflict solved
Merge pull request #43 from whileyryan/comp_profile

idk