resolved the damn conflict, ya assholes