oh, hahaha sorry I'll rephrase *it will probably have to merge the files we've both been touching, but the good news is that I don't think it will interfere with what you're adding/changing because I've only added items, not changed or removed anything you wrote