solved a conflict. but wtf is actually going on.