resolved, never forked

i think this works